1be79e8e7c
Move get user by ID of an SSH key documentation to separate file
2015-09-03 16:32:26 +03:00
8ec59bd18b
Add API method for get user by ID of an SSH key
2015-09-03 15:47:22 +03:00
ff8fb6a6a2
Merge branch 'update-mailroom' into 'master'
...
Update mail_room to 0.4.2 for better error handling
See merge request !1234
2015-09-02 21:53:50 +00:00
14274cdc3b
Merge branch 'refactor-starred-projects-page' into 'master'
...
Split starred projects list and activity
In same way like we did with your projects. For consistency
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1238
2015-09-02 19:50:37 +00: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
774c523c1f
Fix tests and update CHANGELOG
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-02 20:02:26 +02:00
5bbe6c4d54
Split starred projects list and activity in same way like we did with your projects
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-02 19:17:04 +02: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
28219ea921
Merge branch 'fix-raw-controller-disposition' into 'master'
...
Remove the filename argument from Content-Disposition header
This MR removes the filename argument from the `Content-Disposition` header to avoid RFC 5987 and RFC 6266 encoding issues. Some browsers (e.g. Internet Explorer) do not properly decode a Unicode string properly, and this can lead to odd filenames in the raw file download. This change allows the browser to determine the filename based on the URL.
For example, if I have a file called `한글한글.pptx` and click to download it with the "Raw" button in the Files section, IE11 will ask:
If you look at the `Content-Disposition` field, you see this:
Chrome, Firefox, and Safari seem to be able to handle UTF-8 encoded filenames, even though this is not standard.
See: http://greenbytes.de/tech/tc2231/
Closes https://github.com/gitlabhq/gitlabhq/issues/9595
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1829
I've also submitted a pull request to Rails to support RFC 6266: https://github.com/rails/rails/pull/21461
See merge request !1235
2015-09-02 12:25:28 +00:00
6f19e8799e
Merge branch 'drone-ci' into 'master'
...
Drone CI service
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1184#note_1980652
/cc @DouweM
See merge request !1215
2015-09-02 07:23:40 +00:00
551157960e
Remove the filename argument from Content-Disposition header to avoid
...
RFC 5987 and RFC 6266 encoding issues. This change allows the browser
to determine the filename based on the URL.
See: http://greenbytes.de/tech/tc2231/
Closes https://github.com/gitlabhq/gitlabhq/issues/9595
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1829
2015-09-02 00:20:05 -07:00
d72b8f87ac
Update mail_room to 0.4.2 for better error handling
2015-09-02 08:12:01 +01: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
1bcfe4d2ff
Remove PreferencesHelper include from GitlabMarkdownHelper
2015-09-01 13:37:05 -04: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
2ef16e7660
Merge branch 'gitlab-git-http-server' into 'master'
...
Replace grack with gitlab-git-http-server
See merge request !1229
2015-09-01 14:21:45 +00:00
26be65337c
Merge branch 'profile-settings' into 'master'
...
Rename profile settings navigation to "Profile Settings"
Fixes #2555
See merge request !1926
2015-09-01 12:33:04 +00:00
f0aa6986fa
Update db schema
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-01 14:01:56 +02:00
f07273f6f6
Rename profile settings navigation to "Profile Settings"
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-01 13:35:03 +02:00
aa1c321459
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-09-01 12:51:57 +02:00
96b55a0e90
Merge branch 'master' into 'master'
...
Update Racc to 1.4.12
The primary reason for this is that this would let me debug #2343 using Rubinius' `-Xic.debug` option.
See merge request !1201
2015-09-01 10:38:46 +00:00
bbfa65ac30
Merge branch 'add-commands' into 'master'
...
Added new commands to GitLab Basics docs
See merge request !1924
2015-09-01 09:32:18 +00:00
bb86df1bd2
Merge branch 'fix-branches-cache-after-merge' into 'master'
...
Expire cache when merge request source branch was removed
Re-implement !1160 for 8.0. Also we have tests for MergeWorker now! Yay ✨
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1224
2015-09-01 09:09:03 +00:00
86dd1bd7ab
Merge branch 'oauth_token_with_ldap' into 'master'
...
Retrieving oauth token with LDAP credentials
https://dev.gitlab.org/gitlab/gitlabhq/issues/2529
See merge request !1220
2015-09-01 09:06:14 +00:00
c924a3a8d7
deleted additional info
2015-08-31 22:50:32 -07:00
2930041886
Make sure the `gfm` helper passes the required options
...
This adds some duplication, but this helper is temporary.
2015-08-31 18:09:18 -04: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
805693bfea
Remove invalid spec for GitlabMarkdownHelper
2015-08-31 16:22:14 -04:00
90ab92621f
Make `gfm` delegate to `Gitlab::Markdown.gfm` instead of `markdown`
...
Some usages of the `gfm` helper depend on the text not being rendered as
standard Markdown. Ugh.
2015-08-31 16:16:26 -04:00
7816b22360
Fix context options in `markdown` helper
...
We need to send `path`, not `requested_path`.
2015-08-31 16:16:03 -04:00
c767e2e0fd
Merge branch 'fix-headers-blocking-anchors' into 'master'
...
Prevent anchors from being hidden by header upon a new page load
Browsers change the scroll position after the page is loaded, and the current 1 ms
delay wasn't long enough for the browser to jump to the anchor. Even then, it appears
another 100ms delay is necessary to adjust the scroll properly:
http://stackoverflow.com/questions/19057731/scrolltop-on-page-reload-doesnt-work-possible-script-conflict
Add a little more of an offset to see a few lines before the anchor.
* Closes #1614
* Closes #1024
See merge request !1225
2015-08-31 17:11:41 +00:00
780bac1026
Be more defensive when running 'kill'
2015-08-31 16:15:41 +02: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
6f785d584b
retrieving oauth token with LDAP credentials
2015-08-31 15:10:01 +03:00
e334ec0683
Ordering of GitHub issues import is now fixed
...
See 4a203aab57
2015-08-31 08:24:50 +03:00
8c0565b7ca
Merge branch 'dont-notify-users-without-project-access' into 'master'
...
Don't notify users without access to the project when they are (accidentally) mentioned in a note.
Addresses #2366 .
See merge request !1216
2015-08-30 23:56:34 +00:00
c388f3db56
Merge branch 'joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993'
2015-08-29 11:51:46 -07:00
12d8b01eb2
Move changelog item
2015-08-29 11:49:59 -07: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
1fdf56c95d
Prevent anchors from being hidden by header upon a new page load.
...
Browsers change the scroll position after the page is loaded, and the current 1 ms
delay wasn't long enough for the browser to jump to the anchor. Even then, it appears
another 100ms delay is necessary to adjust the scroll properly:
http://stackoverflow.com/questions/19057731/scrolltop-on-page-reload-doesnt-work-possible-script-conflict
Add a little more of an offset to see a few lines before the anchor.
Closes #1614
Closes #1024
2015-08-29 02:05:37 -07:00
39ee52f1b1
Expire cache when merge request source branch was removed
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-28 10:23:56 +02:00
Artem V. Navrotskiy
Artem V. Navrotskiy
Robert Speicher
Dmitriy Zaporozhets
Jacob Vosmaer
Douwe Maan
Stan Hu
Kirilll Zaitsev
Marin Jankovski
Robert Speicher
Marin Jankovski
Dmitriy Zaporozhets
Valery Sizov
Job van der Voort
karen Carias
Valery Sizov
Achilleas Pipinellis
