summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Backport relevant changes from EE https://gitlab.com/gitlab-org/gitlab-ee/mer...backport-ee-3892-to-ceTiago Botelho2018-03-072-0/+11
* Merge branch 'jivl-new-modal-project-labels-milestones' into 'master'Filipa Lacerda2018-03-0719-105/+635
|\
| * used respond_to formats for persisting flash messages insteadjivl-new-modal-project-labels-milestonesJose Ivan Vargas2018-03-0614-96/+36
| * Add persistent flash messagesJose Ivan Vargas2018-03-019-9/+73
| * Changed selector names, address code concernsJose Ivan Vargas2018-03-0113-185/+183
| * Added vue based promotion modals for labels and milestonesJose Ivan Vargas2018-03-0119-97/+625
* | Merge branch 'doc-api-fix' into 'master'Sean McGivern2018-03-072-2/+2
|\ \
| * | Minor fixes in API docJan Provaznik2018-03-072-2/+2
* | | Merge branch 'dz-use-less-deprecated-methods-2' into 'master'Douwe Maan2018-03-079-11/+11
|\ \ \
| * | | Use Project#full_name instead of name_with_namespaceDmitriy Zaporozhets2018-03-079-11/+11
* | | | Merge branch 'gitaly-git-mandatory' into 'master'Douwe Maan2018-03-073-51/+6
|\ \ \ \
| * | | | naming thingsKim "BKC" Carlbäcker2018-03-071-2/+2
| * | | | fix specsgitaly-git-mandatoryKim "BKC" Carlbäcker2018-03-071-26/+2
| * | | | Make git push mandatoryKim "BKC" Carlbäcker2018-03-062-25/+4
* | | | | Merge remote-tracking branch 'dev/master'Robert Speicher2018-03-075-1/+40
|\ \ \ \ \
| * \ \ \ \ Merge branch 'sh-fix-otp-backup-cherry-pick' into 'master'James Lopez2018-03-073-0/+18
| |\ \ \ \ \
| | * | | | | Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'Douwe Maan2018-03-073-0/+18
| * | | | | | Merge branch 'cherry-pick-2c6ce6ff' into 'master'James Lopez2018-03-071-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'pages-6-1-gitlab-10-5' into 'security-10-5'Marin Jankovski2018-03-071-1/+1
| |/ / / / /
| * | | | | Update CHANGELOG.md for 10.3.8Robert Speicher2018-03-011-0/+7
| * | | | | Update CHANGELOG.md for 10.4.5Robert Speicher2018-03-011-0/+7
| * | | | | Update CHANGELOG.md for 10.5.3Robert Speicher2018-03-011-0/+7
* | | | | | Merge branch 'docs/runner-cache-no-gc' into 'master'Marcia Ramos2018-03-071-2/+1
|\ \ \ \ \ \
| * | | | | | Remove wrong assumption about Runners cache GCdocs/runner-cache-no-gcAchilleas Pipinellis2018-03-071-2/+1
* | | | | | | Merge branch 'zj-move-opt-out-ruby-endpoints' into 'master'Sean McGivern2018-03-074-12/+17
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix tests not completely disabling GitalyZeger-Jan van de Weg2018-03-071-3/+3
| * | | | | | Move OperationService#UserRemoveBranchZeger-Jan van de Weg2018-03-071-1/+1
| * | | | | | Move OperationService#UserCreateBranchZeger-Jan van de Weg2018-03-071-1/+1
| * | | | | | Move CommitService#Languages to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| * | | | | | Move RefService#CreateBranch to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| * | | | | | Move RefService#DeleteBranch to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| * | | | | | Move OperationService#UserRevert to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| * | | | | | Move OperationService#UserAddTag to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| * | | | | | Move CommitService::CommitPatch to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| * | | | | | Move Repository#HasLocalBranches to OPT_OUTZeger-Jan van de Weg2018-03-072-1/+6
* | | | | | | Merge branch 'tc-geo-local-only-counts-matcher' into 'master'Nick Thomas2018-03-071-0/+24
|\ \ \ \ \ \ \
| * | | | | | | Add matcher to match elements by idstc-geo-local-only-counts-matcherToon Claes2018-03-061-0/+24
* | | | | | | | Merge branch 'patch-19' into 'master'Stan Hu2018-03-071-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | add nginx_status monitoring detailsBen Bodenmiller2018-03-071-0/+1
* | | | | | | | | Merge branch 'mr-commit-optimization' into 'master'Sean McGivern2018-03-077-15/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't do a commit lookup to present the MR entity, just return the shamr-commit-optimizationAlejandro Rodríguez2018-03-062-5/+3
| * | | | | | | | | Use persisted/memoized value for MRs shas instead of doing git lookupsAlejandro Rodríguez2018-03-065-10/+27
* | | | | | | | | | Merge branch 'jprovazn-api' into 'master'Sean McGivern2018-03-0722-596/+1311
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add discussion APIjprovazn-apiJan Provaznik2018-03-0722-596/+1311
* | | | | | | | | | | Merge branch '43486-update-language-about-version-check-in-admin-settings-and...Sean McGivern2018-03-073-12/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Clarify version check in admin settings43486-update-language-about-version-check-in-admin-settings-and-docsSean McGivern2018-03-073-12/+20
* | | | | | | | | | | | Merge branch 'replace_redcarpet_with_cmark' into 'master'Sean McGivern2018-03-0712-35/+165
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add CommonMark markdown enginereplace_redcarpet_with_cmarkblackst0ne2018-03-0712-35/+165
* | | | | | | | | | | | | Merge branch '43460-track-projects-a-user-contributed-to' into 'master'Yorick Peterse2018-03-078-0/+299
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Shortcut and return on duplicate record error.43460-track-projects-a-user-contributed-toAndreas Brandl2018-03-061-3/+3
View Lorry Controller Status