summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Test using a 1.9.8 phantomjs version built with fpmphantomjsAchilleas Pipinellis2015-11-291-2/+2
| | | | https://gitlab.com/axil/phantomjs-debian
* Update phantomjs to 2.0.0Achilleas Pipinellis2015-11-291-2/+2
| | | | * Version 1.9 was removed from upstream Debian repos
* Merge branch 'remove-satellites-reference' into 'master' Achilleas Pipinellis2015-11-281-3/+0
|\ | | | | | | | | | | | | Remove reverence to satellites Remove reference in backup docs See merge request !1923
| * Remove reverence to satellites [ci skip]remove-satellites-referenceRobert Schilling2015-11-281-3/+0
|/
* Merge branch 'doc_public_access' into 'master' Sytse Sijbrandij2015-11-281-18/+33
|\ | | | | | | | | | | | | Update public access documentation See merge request !1837
| * Update public access documentation [ci skip]Achilleas Pipinellis2015-11-191-18/+33
| |
* | Merge branch 'nginx-workhorse-upload-limit' into 'master' Robert Speicher2015-11-272-12/+24
|\ \ | | | | | | | | | | | | Nginx workhorse upload limit See merge request !1919
| * | Fix alignmentRobert Speicher2015-11-271-6/+6
| | | | | | | | | | | | [ci skip]
| * | Fix indentation in NGINX confignginx-workhorse-upload-limitJacob Vosmaer2015-11-271-6/+6
| | |
| * | Repeat "client_max_body_size 0" everywhereJacob Vosmaer2015-11-272-0/+12
| | | | | | | | | | | | | | | It turns out that if we do not the declaration from "location /" wins.
* | | Merge branch 'jcorcuera/gitlab-ce-issue_3428'Douwe Maan2015-11-277-6/+62
|\ \ \
| * | | Strip attributes for Milestone and Issuable. #3428Jose Corcuera2015-11-267-6/+62
| | | |
* | | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqStan Hu2015-11-264-14/+18
|\ \ \ \ | |/ / / |/| | |
| * | | Merge pull request #9670 from janten/gravatar-retinaStan Hu2015-11-264-14/+18
| |\ \ \ | | |/ / | |/| | Add support for HiDPI displays in gravatar service
| | * | Fix typoJan-Gerd Tenberge2015-11-011-1/+1
| | | |
| | * | Fix merge errorJan-Gerd Tenberge2015-10-231-1/+1
| | | |
| | * | Merge branch 'gitlabhq-master' into gravatar-retinaJan-Gerd Tenberge2015-10-22778-7454/+11695
| | |\ \
| | | * \ Fix merge errorJan-Gerd Tenberge2015-10-22778-7454/+11695
| | | |\ \ | | |/ / /
| | * | | Merge remote-tracking branch 'origin/master' into gravatar-retinaJan-Gerd Tenberge2015-10-221-1/+1
| | |\ \ \
| | | * | | Update specJan-Gerd Tenberge2015-10-191-2/+2
| | | | | |
| | * | | | Update specJan-Gerd Tenberge2015-10-191-1/+1
| | | | | |
| | * | | | Add scale argument in user classJan-Gerd Tenberge2015-09-262-4/+4
| | | | | |
| | * | | | Add scale parameter to helperJan-Gerd Tenberge2015-09-261-2/+2
| | | | | |
| | * | | | Add support for HiDPI displays in gravatar serviceJan-Gerd Tenberge2015-09-262-6/+10
| | |/ / /
* | | | | Merge branch 'rs-markdown-preview' into 'master' Douwe Maan2015-11-263-77/+92
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decouple Markdown previews from DropzoneInput See merge request !1908
| * | | | | Decouple Markdown previews from DropzoneInputrs-markdown-previewRobert Speicher2015-11-253-77/+92
| | | | | |
* | | | | | Merge branch 'dbalexandre/gitlab-ce-fix-raw-personal-snippet-access-workflow'Douwe Maan2015-11-263-1/+117
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix raw private snippets access workflowDouglas Barbosa Alexandre2015-11-253-1/+117
| |/ / / /
* | | | | Merge branch 'rs-remove-enumerize' into 'master' Dmitriy Zaporozhets2015-11-263-8/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove enumerize gem Closes #2803 See merge request !1912
| * | | | | Remove enumerize gemrs-remove-enumerizeRobert Speicher2015-11-253-8/+1
| |/ / / /
* | | | | Merge branch 'rs-update-asana' into 'master' Dmitriy Zaporozhets2015-11-262-10/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump asana to ~> 0.4.0 Closes #2830 See merge request !1911
| * | | | | Bump asana to ~> 0.4.0rs-update-asanaRobert Speicher2015-11-252-10/+10
| |/ / / / | | | | | | | | | | | | | | | Closes #2830
* | | | | Merge branch 'rs-update-doorkeeper' into 'master' Dmitriy Zaporozhets2015-11-262-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump doorkeeper to ~> 2.2.0 Closes #2746 See merge request !1910
| * | | | | Bump doorkeeper to ~> 2.2.0rs-update-doorkeeperRobert Speicher2015-11-252-3/+3
| |/ / / / | | | | | | | | | | | | | | | Closes #2746
* | | | | Merge branch 'fix-dup-changelog-entry' into 'master' Stan Hu2015-11-261-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate CHANGELOG entry shipped in 8.1.4 See merge request !1914
| * | | | | Remove duplicate entry shipped in 8.1.4Stan Hu2015-11-251-1/+0
| |/ / / /
* | | | | Merge branch 'rs-rescueexception-cop' into 'master' Dmitriy Zaporozhets2015-11-261-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Enable the Lint/RescueException cop See merge request !1894
| * | | | Enable the Lint/RescueException coprs-rescueexception-copRobert Speicher2015-11-241-1/+1
| | | | |
* | | | | Merge branch 'new-member-page' into 'master' Dmitriy Zaporozhets2015-11-2519-489/+457
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve group and project members pages * Improve UI for group members page * Improve UI for project members page For internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2057 This MR should solve usability problem with adding new member to group/project See merge request !1886
| * | | | | Fix rubocop complainnew-member-pageDmitriy Zaporozhets2015-11-251-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Split group feature testsDmitriy Zaporozhets2015-11-2510-356/+380
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Refactor group stepsDmitriy Zaporozhets2015-11-251-61/+16
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Refactor group members tests a bitDmitriy Zaporozhets2015-11-254-27/+15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Improve project members page UIDmitriy Zaporozhets2015-11-256-49/+36
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Improve UI for group members pageDmitriy Zaporozhets2015-11-255-32/+43
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'bump-gitlab-shell' into 'master' Dmitriy Zaporozhets2015-11-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump gitlab-shell to 2.6.8 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For gitlab/gitlabhq#2635 See merge request !1939
| * | | | | | Bump gitlab-shell to 2.6.8Dmitriy Zaporozhets2015-11-251-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'sherlock-total-query-time' into 'master' Yorick Peterse2015-11-254-0/+25
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added total query time to Sherlock This makes it easier to see if a problem is caused by slow queries or slow Ruby code (unrelated to any SQL queries that might be used). See merge request !1887
| * | | | | Added total query time to Sherlocksherlock-total-query-timeYorick Peterse2015-11-244-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to see if a problem is caused by slow queries or slow Ruby code (unrelated to any SQL queries that might be used).
* | | | | | Merge branch 'lfs-doc' into 'master' Robert Schilling2015-11-251-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add reference to Microsoft's Git Credential Manager for Windows. Minor update to the LFS-documentation, referencing Microsoft's Git Credential Manager for Windows. See merge request !1892