59d0263bc8
Fix rubocop warnings in lib
2015-10-03 01:29:58 -05:00
e0609a7800
Merge branch 'show-diff-stats-for-mr'
2015-10-01 17:02:53 +02:00
0d967bce57
Show additions/deletions stats on merge request diff
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-01 13:52:08 +02:00
e82b37a653
Add support of multibyte characters in LDAP UID
2015-09-30 13:47:50 +03:00
4957415e00
Merge pull request #9650 from szechyjs/fb-close-comment
...
FogBugz Import: Include closed comments since they may contain user data
2015-09-25 16:46:50 -07:00
73a3df4de3
Fix LDAP attribute mapping
2015-09-23 16:37:59 +02:00
d4acda1253
Merge branch 'rs-relative-link-up-one' into 'master'
...
Allow relative links to go up one directory level
See merge request !1352
2015-09-21 19:38:37 +00:00
4e2bb80fb3
FogBugz Import: Closed comments may contain user data
2015-09-21 10:49:44 -04:00
ee028d9d60
Rename reply_by_email to incoming_email to prepare for the future.
2015-09-21 10:35:37 +02:00
2b94f5fb06
Allow RelativeLinkFilter to go up multiple directories
2015-09-20 19:21:33 -04:00
3377808193
Fix reply by email for comments on a specific line in a diff/commit.
2015-09-20 18:18:39 +02:00
619f04c196
Allow relative links to go up one directory level
2015-09-18 14:03:42 -04:00
09bcce7d1f
Merge branch 'ldap-attributes' into 'master'
...
Allow configuration of LDAP attributes GitLab will use for the new user account.
Fixes #2412 .
See merge request !1261
2015-09-16 18:34:55 +00:00
84d57bc703
Make code clearer
2015-09-16 09:14:04 +02:00
e3c30bf2e8
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-11 16:32:11 +02:00
4f461fd45f
Merge branch 'rs-fix-highlighting' into 'master'
...
Syntax highlighting improvements
On the server side:
During development I would occasionally see SanitizationFilter sanitizing
the result of SyntaxHighlightFilter, even though its attributes were
whitelisted. This updates the `clean_spans` transformer to return the
whitelisted node as [suggested by the Sanitize docs](http://git.io/vZR8i ).
On the client side:
- Makes the syntax_highlight JS more flexible
- Adds JS specs
- Simplifies highlighting of new notes
- Adds highlighting to Markdown preview
See merge request !1278
2015-09-11 08:47:13 +00:00
267687993a
Add comments and clean up test for !1274
2015-09-10 14:24:10 -07:00
e3c97ede96
RU-BO-COOOOOOOOP
2015-09-10 16:06:24 -04:00
7cbf5e4d18
Prevent result of SyntaxHighlightFilter being sanitized
2015-09-10 15:08:06 -04:00
9d3344adbb
Gracefully handle errors in syntax highlighting by leaving the block unformatted
...
Closes #2433
2015-09-10 09:16:27 -07:00
0d41b2dd87
Merge branch 'fix-emojis-relative-url' into 'master'
...
Fix emoji URLs in Markdown when relative_url_root is used
Path/URL helpers (e.g. `asset_url_helper`) already include the relative_url_root, so there is no need to attach it twice.
Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example:
RELATIVE_URL_ROOT=/gitlab rspec
Closes #1728
See merge request !1254
2015-09-09 14:53:14 +00:00
0b5d627cd4
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-09-09 14:56:02 +02:00
90c338a495
Move helpers back to original directory
2015-09-09 14:37:34 +02:00
909a8443c6
Shuffle config around a bit
2015-09-09 11:40:31 +01:00
e156f42079
FogBugz project import
2015-09-08 20:23:01 -04:00
0e9ba0a4fa
Add attributes to LDAP::Config.
2015-09-08 17:34:18 +01:00
c915e2c823
Allow configuration of LDAP attributes GitLab will use for the new user account.
2015-09-08 16:18:14 +01:00
8820785c8f
Fix emoji URLs in Markdown when relative_url_root is used
...
Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example:
RELATIVE_URL_ROOT=/gitlab rspec
Closes #1728
2015-09-06 09:46:10 -07:00
a5314e79f2
Fix URL construction for merge requests, issues, notes, and commits for relative URL config
...
Closes https://github.com/gitlabhq/gitlabhq/issues/9605
2015-09-04 16:24:01 -07:00
d9f794a850
Merge branch 'grack-auth-new-instance' into 'master'
...
Avoid instance variable re-use trouble
This is the quickest/dumbest/safest way I could think of to prevent
the instance variable reuse problems we have on dev.gitlab.org now.
See merge request !1237
2015-09-02 18:05:16 +00:00
30bf2b9cc3
Avoid instance variable re-use trouble
...
This is the quickest/dumbest/safest way I could think of to prevent
the instance variable reuse problems we have on dev.gitlab.org now.
2015-09-02 18:47:56 +02:00
263abda3fd
Drone CI service
2015-09-02 05:52:16 +03:00
308c6428ae
Merge branch 'use_db_for_application_settings' into 'master'
...
Check if database connection exists when loading application settings
!1217 broke omnibus-gitlab nightly builds. In omnibus-gitlab we precompile assets without a running database.
See merge request !1230
2015-09-01 21:14:57 +00:00
afb2e6f485
Merge branch 'rs-cleanup-redcarpet-renderer' into 'master'
...
Decouple Gitlab::Markdown from the GitlabMarkdownHelper
This module is now the sole source of knowledge for *how* we render
Markdown (and GFM).
See merge request !1223
2015-09-01 20:13:44 +00:00
2236e9d617
Merge branch 'fix-bitbucket-import-issue-order' into 'master'
...
Import all Bitbucket issues and sort issues by creation date
Previously only the first 15 Bitbucket issues would be imported. Other issues in the API return call also calls import errors.
Tested by importing 400+ issues from this repo: https://bitbucket.org/ned/coveragepy
API reference here: https://bitbucket.org/site/master/issues/3571/api-issues-sorting-bb-3518
Closes https://github.com/gitlabhq/gitlabhq/issues/9519
See merge request !1226
2015-09-01 17:29:08 +00:00
f43e48a1ce
Require gitlab/markdown in ReferenceExtractor
2015-09-01 13:28:19 -04:00
2e9c922dd1
Fix bug where only the first 15 Bitbucket issues would be imported.
...
Also fix a number of issues where author/reporter names were not available.
2015-09-01 08:50:20 -07:00
3a8773fb2f
Added USE_DB env var to allow loading fake settings without db running.
2015-09-01 17:49:16 +02:00
31e4654b1f
Sort issues by creation date in Bitbucket importer
...
API reference here: https://bitbucket.org/site/master/issues/3571/api-issues-sorting-bb-3518
Closes https://github.com/gitlabhq/gitlabhq/issues/9519
2015-09-01 08:46:42 -07:00
c104f4d590
Remove unnecessary `strip` from `reference_class` method
2015-08-31 16:23:46 -04:00
08ca941186
Move REDCARPET_OPTIONS to a private method
...
There wasn't really a reason to have them as a constant, and we were
getting "already defined" warnings which are always annoying.
2015-08-31 16:22:34 -04:00
90b1ecfa01
Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-server
2015-08-31 15:51:41 +02:00
4027a26e7b
Replace grack with gitlab-git-http-server
2015-08-31 15:30:15 +02:00
fe86c8dfbd
Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993
2015-08-29 11:49:14 -07:00
d92f428024
Minor refactor
2015-08-29 11:48:54 -07:00
a429eb4d45
Merge branch 'fix-session_expire_delay' into 'master'
...
read session_expire_delay from database if table & column exists;
Previous code only ends up using the default value for session_expire_delay, not the value stored in the database, making the session always 1 week.
See merge request !1217
2015-08-28 07:55:51 +00:00
23aee0ca8a
fixed connection detection so settings can be read from the database
2015-08-27 21:21:31 -04:00
9bb06ae9ef
Make sure the main Gitlab::Markdown module gets loaded before filters
2015-08-27 16:02:49 -07:00
8e7111f79d
Reference filters no longer take a custom class context option
2015-08-27 15:36:26 -07:00
4340dd3eeb
Decouple Gitlab::Markdown from the GitlabMarkdownHelper
...
This module is now the sole source of knowledge for *how* we render
Markdown (and GFM).
2015-08-27 14:17:26 -07:00
Guilherme Garnier
Dmitriy Zaporozhets
Петров Роман
Stan Hu
Douwe Maan
Robert Speicher
Jared Szechy
Robert Speicher
Jared Szechy
Jacob Vosmaer
Kirilll Zaitsev
Marin Jankovski
Marin Jankovski
Eric Maziade