summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add the /help page in robots.txtrobots-helpAchilleas Pipinellis2018-03-221-0/+1
| | | | | | | The /help page has docs which we don't want to be crawled as we prefer the docs website instead. Related https://gitlab.com/gitlab-org/gitlab-ce/issues/44433
* Update VERSION to 10.7.0-prev10.7.0.preJames Lopez2018-03-221-1/+1
|
* Update CHANGELOG.md for 10.6.0James Lopez2018-03-22151-749/+184
| | | [ci skip]
* Merge branch 'add-query-counts-to-profiler-output' into 'master'Stan Hu2018-03-223-6/+35
|\ | | | | | | | | Add query counts by model to profiler output See merge request gitlab-org/gitlab-ce!17910
| * Add query counts by model to profiler outputadd-query-counts-to-profiler-outputSean McGivern2018-03-213-6/+35
| |
* | Merge remote-tracking branch 'dev/master'Robert Speicher2018-03-211-0/+25
|\ \
| * | Update CHANGELOG.md for 10.5.6Mark Fletcher2018-03-161-0/+8
| | | | | | | | | [ci skip]
| * | Update CHANGELOG.md for 10.4.6Mark Fletcher2018-03-161-0/+8
| | | | | | | | | [ci skip]
| * | Update CHANGELOG.md for 10.3.9Mark Fletcher2018-03-161-0/+9
| | | | | | | | | [ci skip]
* | | Merge branch 'disable-btn-mr-when-posting-comment' into 'master'Fatih Acet2018-03-212-2/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Disables the button when submitting comment. Closes #39661 See merge request gitlab-org/gitlab-ce!17918
| * | | Adds testsJacob Schatz2018-03-211-0/+14
| | | |
| * | | Disables the button when submitting comment.Jacob Schatz2018-03-211-2/+3
| | | |
* | | | Merge branch 'docs/ci-caching' into 'master'Marcia Ramos2018-03-214-86/+569
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs on CI caching Closes #32515, #18945, and gitlab-runner#1621 See merge request gitlab-org/gitlab-ce!12183
| * | | | Gather info on CI/CD cachingAchilleas Pipinellis2018-03-214-86/+569
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - New cache page - Move manual cache clearing to the new page - Add all directives of cache in the yaml reference
* | | | | Merge branch 'refactor/move-time-tracking-vue-components' into 'master'Filipa Lacerda2018-03-214-98/+109
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move TimeTrackingCollapsedState vue component See merge request gitlab-org/gitlab-ce!17399
| * | | | | Move TimeTrackingCollapsedState vue componentGeorge Tsiolis2018-03-214-98/+109
| | | | | |
* | | | | | Merge branch 'docs/clarify-mail-room-procfile-location' into 'master'Sean McGivern2018-03-212-9/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify location of Procfile for mail_room See merge request gitlab-org/gitlab-ce!17896
| * | | | | | Launch mail_room manually and remove foreman referenceEric Eastwood2018-03-212-9/+2
| | | | | | |
* | | | | | | Merge branch 'update-omniauth' into 'master'Robert Speicher2018-03-212-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update omniauth 1.4.2 -> 1.8 See merge request gitlab-org/gitlab-ce!17763
| * | | | | | | Update omniauth 1.4.2 -> 1.8Pirate Praveen2018-03-212-4/+4
| | | | | | | |
* | | | | | | | Merge branch 'ee-5063-to-ce-backport' into 'master'Douwe Maan2018-03-213-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backports changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5063 to CE See merge request gitlab-org/gitlab-ce!17909
| * | | | | | | | Backports changes made in ↵ee-5063-to-ce-backportTiago Botelho2018-03-213-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5063 to CE
* | | | | | | | | Merge branch 'blackst0ne-rails5-add-second-gemfile' into 'master'Robert Speicher2018-03-213-5/+1255
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Add `Gemfile.rails5` See merge request gitlab-org/gitlab-ce!17761
| * | | | | | | | [Rails5] Add Gemfile.rails5blackst0ne-rails5-add-second-gemfileblackst0ne2018-03-153-5/+1255
| | | | | | | | |
* | | | | | | | | Merge branch '43786-on-the-issuable-list-add-tooltips-to-icons' into 'master'Clement Ho2018-03-215-11/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issuable list: add tooltips to icons Closes #43786 See merge request gitlab-org/gitlab-ce!17700
| * | | | | | | | | Issuable list: add tooltips to iconsLukas Eipert2018-03-215-11/+25
|/ / / / / / / / /
* | | | | | | | | Merge branch 'ide-folder-button-path' into 'master'Tim Zallmann2018-03-217-46/+95
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the web IDE link in tree list opening the wrong URL Closes #44477 See merge request gitlab-org/gitlab-ce!17900
| * | | | | | | | | Fixes the web IDE link in tree list opening the wrong URLPhil Hughes2018-03-217-46/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #44477
* | | | | | | | | | Merge branch 'blackst0ne-rails5-update-ar5-batching-initializer' into 'master'Robert Speicher2018-03-211-37/+35
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Update ar5_batching initializer See merge request gitlab-org/gitlab-ce!17825
| * | | | | | | | | | [Rails5] Update ar5_batching initializerblackst0ne-rails5-update-ar5-batching-initializerblackst0ne2018-03-211-37/+35
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'blackst0ne-rails5-update-ar5-pg-10-support-initializer' into ↵Robert Speicher2018-03-211-3/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [Rails5] Update ar5_pg_10_support initializer See merge request gitlab-org/gitlab-ce!17826
| * | | | | | | | | | [Rails5] Update ar5_pg_10_support initializerblackst0ne-rails5-update-ar5-pg-10-support-initializerblackst0ne2018-03-211-3/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'remove-parser-warnings-workaround' into 'master'Robert Speicher2018-03-211-9/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove parser warnings workaround See merge request gitlab-org/gitlab-ce!17901
| * | | | | | | | | It's now updated so we could remove itLin Jen-Shin2018-03-211-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17673
* | | | | | | | | | Merge branch 'gitaly-upload-archive' into 'master'Sean McGivern2018-03-213-2/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send Gitaly payload for git-upload-archive SSH commands Closes gitaly#1092 See merge request gitlab-org/gitlab-ce!17903
| * | | | | | | | | | Send Gitaly payload for git-upload-archive SSH commandsAlejandro Rodríguez2018-03-213-2/+8
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ab-44446-add-indexes-for-user-activity-queries' into 'master'Yorick Peterse2018-03-213-1/+48
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add indexes for user activity queries. Closes #44446 See merge request gitlab-org/gitlab-ce!17890
| * | | | | | | | | | Guard creation/removal with existence checks.Andreas Brandl2018-03-211-6/+16
| | | | | | | | | | |
| * | | | | | | | | | Flip column order in new index.Andreas Brandl2018-03-212-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Patch MySQL's odd foreign key behavior.Andreas Brandl2018-03-211-1/+14
| | | | | | | | | | |
| * | | | | | | | | | Add indexes for user activity queries.Andreas Brandl2018-03-213-1/+25
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #44446.
* | | | | | | | | | Merge branch 'flip-carets' into 'master'Phil Hughes2018-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | makes caret go to the right side when closing most right issueboard list Closes #40913 See merge request gitlab-org/gitlab-ce!17773
| * | | | | | | | | | makes caret go to the right side when closing most right issueboard listflip-caretsDimitrie Hoekstra2018-03-151-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'ab-43887-concurrent-migration-helpers' into 'master'Yorick Peterse2018-03-217-62/+163
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convenient use of concurrent migration helpers Closes #43887 See merge request gitlab-org/gitlab-ce!17888
| * | | | | | | | | | | Shortcut concurrent foreign key creation if already exists.ab-43887-concurrent-migration-helpersAndreas Brandl2018-03-206-51/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #43887.
| * | | | | | | | | | | Shortcut concurrent index creation/removal if no effect.Andreas Brandl2018-03-203-11/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Index creation does not have an effect if the index is present already. Index removal does not have an affect if the index is not present. This helps to avoid patterns like this in migrations: ``` if index_exists?(...) remove_concurrent_index(...) end ```
* | | | | | | | | | | | Merge branch '39584-nesting-depth-5-framework-dropdowns' into 'master'Clement Ho2018-03-212-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NestingDepth (level 5) in framework/dropdowns.scss See merge request gitlab-org/gitlab-ce!17820
| * | | | | | | | | | | Apply NestingDepth (level 5) (framework/dropdowns.scss)Takuya Noguchi2018-03-212-4/+7
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ide-project-avatar-identicon' into 'master'Filipa Lacerda2018-03-213-7/+62
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes empty project avatar to identicon in the IDE Closes #44298 See merge request gitlab-org/gitlab-ce!17899
| * | | | | | | | | | | | Changes empty project avatar to identicon in the IDEPhil Hughes2018-03-213-7/+62
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #44298