summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Set target_branch to the ref branch when creating MR from issue41727-target-branch-nameJarka Kadlecová2018-01-173-0/+25
|
* Merge branch 'winh-exclude-locale-coverage' into 'master'Tim Zallmann2018-01-111-1/+2
|\ | | | | | | | | Exclude translations from coverage report See merge request gitlab-org/gitlab-ce!16348
| * Exclude translations from coverage reportwinh-exclude-locale-coverageWinnie Hellmann2018-01-101-1/+2
| |
* | Merge branch 'dispatcher-sessions' into 'master'Phil Hughes2018-01-117-9/+17
|\ \ | | | | | | | | | | | | Refactor dispatcher sessions path See merge request gitlab-org/gitlab-ce!16362
| * | Fix specsdispatcher-sessionsClement Ho2018-01-102-2/+2
| | |
| * | Fix importClement Ho2018-01-101-1/+1
| | |
| * | Refactor dispatcher sessions pathClement Ho2018-01-105-6/+14
| | |
* | | Merge branch 'dispatcher-search' into 'master'Phil Hughes2018-01-113-4/+8
|\ \ \ | | | | | | | | | | | | | | | | Refactor dispatcher search path See merge request gitlab-org/gitlab-ce!16366
| * | | Refactor dispatcher search pathdispatcher-searchClement Ho2018-01-103-4/+8
| |/ /
* | | Merge branch '41789-fix-up-web-ide-user-preference-copy-and-buttons' into ↵Tim Zallmann2018-01-118-8/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix up Web IDE user preference copy and buttons Closes #41789 See merge request gitlab-org/gitlab-ce!16298
| * | | Fix up Web IDE user preference copy and buttonsJose Ivan Vargas2018-01-118-8/+11
|/ / /
* | | Merge branch 'sh-fix-award-emoji-move-issues' into 'master'Grzegorz Bizon2018-01-113-8/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where award emojis would be lost when moving issues between projects Closes #33423 See merge request gitlab-org/gitlab-ce!16377
| * | | Fix bug where award emojis would be lost when moving issues between projectssh-fix-award-emoji-move-issuesStan Hu2018-01-103-8/+25
| | | | | | | | | | | | | | | | Closes #33423
* | | | Merge branch '41600-wider-project-readme-on-fixed-layout' into 'master'Annabel Dunstone Gray2018-01-112-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Too narrow project READMEs on fixed layout Closes #41600 See merge request gitlab-org/gitlab-ce!16181
| * | | | Make project README containers wider on fixed layoutTakuya Noguchi2018-01-032-1/+6
| | | | |
* | | | | Merge branch '41709-rich-blob-viewer-margins-for-pc' into 'master'Annabel Dunstone Gray2018-01-113-12/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make rich blob viewer wider for PC Closes #41709 See merge request gitlab-org/gitlab-ce!16262
| * | | | | Make rich blob viewer wider for PCTakuya Noguchi2018-01-103-12/+6
| | | | | |
* | | | | | Merge branch 'explore-dispatcher-refactor' into 'master'Fatih Acet2018-01-103-15/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactors the dispatcher for `explore:*`. See merge request gitlab-org/gitlab-ce!16296
| * | | | | | Code improvements and fix bad conflict mergeexplore-dispatcher-refactorClement Ho2018-01-102-5/+1
| | | | | | |
| * | | | | | Merge branch 'master' into 'explore-dispatcher-refactor'Clement Ho2018-01-10283-5538/+7340
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js
| * | | | | | Fix eslintJacob Schatz2018-01-083-13/+11
| | | | | | |
| * | | | | | Merge branch 'master' into explore-dispatcher-refactorJacob Schatz2018-01-087-12/+34
| |\ \ \ \ \ \
| * | | | | | | Fixes duplicationJacob Schatz2018-01-081-16/+0
| | | | | | | |
| * | | | | | | Updating dispatcher without code fixesJacob Schatz2018-01-083-410/+357
| | | | | | | |
| * | | | | | | Refactor `explore:*`Jacob Schatz2018-01-083-342/+428
| | | | | | | |
* | | | | | | | Merge branch 'projects-a-refactor' into 'master'Fatih Acet2018-01-104-7/+33
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | projects:a* dispatcher refactor See merge request gitlab-org/gitlab-ce!16300
| * | | | | | | | Fix indention and bad conflict mergeprojects-a-refactorClement Ho2018-01-101-7/+6
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into 'projects-a-refactor'Clement Ho2018-01-10284-5542/+7362
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js
| * | | | | | | | Finishes dispatcher `projects:a*` stuff.Jacob Schatz2018-01-083-5/+22
| | | | | | | | |
| * | | | | | | | Fix `projects:a*` refactor for dispatcherJacob Schatz2018-01-082-2/+11
| | | | | | | | |
* | | | | | | | | Merge branch 'docs-update-redmine' into 'master'Oswaldo Ferreira2018-01-101-6/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Redmine docs to let user know that `new_issue_url` is not being used. See merge request gitlab-org/gitlab-ce!16353
| * | | | | | | | | Update Redmine docs to let user know that `new_issue_url` is not being used.Victor Wu2018-01-101-6/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch '41491-fix-nil-blob-name-error' into 'master'Annabel Dunstone Gray2018-01-105-4/+33
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 error when visiting a commit where the blobs do not exist (nil blobs) Closes #41491 See merge request gitlab-org/gitlab-ce!16237
| * | | | | | | | | Fix 500 when visiting a commit where blobs do not exist (nil blobs)41491-fix-nil-blob-name-errorEric Eastwood2018-01-095-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41491
* | | | | | | | | | Merge branch 'git-write-ref-prep' into 'master'Robert Speicher2018-01-104-11/+19
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Git::Repository#write_ref client-prep take 2 Closes gitaly#793 See merge request gitlab-org/gitlab-ce!16287
| * | | | | | | | | | Client-prep Gitlab::Git::Repository#write_refgit-write-ref-prepKim "BKC" Carlbäcker2018-01-094-11/+19
| | | | | | | | | | |
* | | | | | | | | | | Merge branch ↵Achilleas Pipinellis2018-01-102-0/+12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '29322-include-the-crowd-application-permission-information-on-the-crowd-omniauth-provider-page' into 'master' Resolve "Include the Crowd application permission information on the "Crowd OmniAuth Provider" page" Closes #29322 See merge request gitlab-org/gitlab-ce!16317
| * | | | | | | | | | | Resolve "Include the Crowd application permission information on the "Crowd ↵Xiaogang Wen2018-01-102-0/+12
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OmniAuth Provider" page"
* | | | | | | | | | | Merge branch 'dz-fix-webmock' into 'master'Stan Hu2018-01-101-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly enable webmock in spinach env See merge request gitlab-org/gitlab-ce!16346
| * | | | | | | | | | | Explicitly enable webmock in spinach envDmitriy Zaporozhets2018-01-101-3/+3
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'docs-move-article-install-git' into 'master'Achilleas Pipinellis2018-01-104-109/+101
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: move article "installing Git" to its topic-related dir See merge request gitlab-org/gitlab-ce!16322
| * | | | | | | | | | Docs: move article "installing Git" to its topic-related dirMarcia Ramos2018-01-104-109/+101
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'da-verify-integrity-of-uploaded-files' into 'master'Robert Speicher2018-01-104-0/+109
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Verify integrity of uploaded files" Closes #39949 See merge request gitlab-org/gitlab-ce!16297
| * | | | | | | | | | Add docs for ENV variables take gitlab:uploads:check rake task supportsda-verify-integrity-of-uploaded-filesDouglas Barbosa Alexandre2018-01-091-0/+13
| | | | | | | | | | |
| * | | | | | | | | | Fix small typosDouglas Barbosa Alexandre2018-01-092-4/+4
| | | | | | | | | | |
| * | | | | | | | | | Refactoring spec for the gitlab:uploads:check rake taskDouglas Barbosa Alexandre2018-01-081-6/+5
| | | | | | | | | | |
| * | | | | | | | | | Make Rubocop happyDouglas Barbosa Alexandre2018-01-081-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Add docs for the gitlab:uploads:check rake taskDouglas Barbosa Alexandre2018-01-081-0/+20
| | | | | | | | | | |
| * | | | | | | | | | Add CHANGELOGDouglas Barbosa Alexandre2018-01-081-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Add spec for gitlab:uploads rake tasksDouglas Barbosa Alexandre2018-01-081-0/+28
| | | | | | | | | | |