summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update POT filecopy-changes-for-abuse-clarityMartin Wortschack2018-11-071-0/+3
* Interpolate textMartin Wortschack2018-11-071-4/+3
* Merge branch 'master' into copy-changes-for-abuse-clarityMartin Wortschack2018-11-072865-26890/+183029
|\
| * Merge branch 'fix-53298' into 'master'Dmitriy Zaporozhets2018-10-302-1/+6
| |\
| | * Adding changelog entryAmit Rathi2018-10-301-0/+5
| | * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceAmit Rathi2018-10-3026-341/+301
| | |\
| | * | Fix #53298: JupyterHub to restarts should work without errorsAmit Rathi2018-10-301-1/+1
| * | | Merge branch 'mlapierre-master-patch-47853' into 'master'Marin Jankovski2018-10-301-3/+3
| |\ \ \
| | * | | Fix Review Apps testing guidemlapierre-master-patch-47853Mark Lapierre2018-10-291-3/+3
| * | | | Merge branch 'rename-secret-variables-1' into 'master'Grzegorz Bizon2018-10-3025-64/+69
| |\ \ \ \
| | * | | | Renaming Secret Variables in the codebaseMarcel Amirault2018-10-3025-64/+69
| |/ / / /
| * | | | Merge branch 'qa-filter-comments-in-issues' into 'master'Grzegorz Bizon2018-10-303-15/+55
| |\ \ \ \
| | * | | | Adding tests for filtering activities/comments in issuesRamya Authappan2018-10-303-15/+55
| |/ / / /
| * | | | Merge remote-tracking branch 'origin/master' into dev-masterJan Provaznik2018-10-3023-59/+66
| |\ \ \ \
| | * \ \ \ Merge branch 'bw-fix-spec-in-merge' into 'master'Stan Hu2018-10-301-1/+1
| | |\ \ \ \
| | | * | | | Fix problem with spec that showed up in EE mergeBrett Walker2018-10-291-1/+1
| | * | | | | Merge branch 'docs-add_deprecation_notice_for_renamed_licensed_feature-ce' in...Evan Read2018-10-301-0/+6
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Add deprecation notice for renamed licensed featuredocs-add_deprecation_notice_for_renamed_licensed_feature-ceOlivier Gonzalez2018-10-241-0/+6
| | * | | | | Merge branch 'patch-31' into 'master'Evan Read2018-10-301-0/+3
| | |\ \ \ \ \
| | | * | | | | Added a note about machine typesMark Veenstra2018-10-301-0/+3
| | |/ / / / /
| | * | | | | Merge branch 'update-gitlab-ui' into 'master'Mike Greiling2018-10-2916-51/+51
| | |\ \ \ \ \
| | | * | | | | Update gitlab-ui to 1.9.0Clement Ho2018-10-2916-51/+51
| | |/ / / / /
| | * | | | | Merge branch '53270-remove-mousetrap-rails' into 'master'Mike Greiling2018-10-294-7/+5
| | |\ \ \ \ \
| | | * | | | | Remove mousetrap-rails gemTakuya Noguchi2018-10-284-7/+5
| * | | | | | | Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-29406-3204/+6889
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'Douwe Maan2018-10-2925-47/+55
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Revert _diffs.html.hamlblackst0ne-update-push-new-merge-request-urlblackst0ne2018-10-271-1/+0
| | | * | | | | Fix specsblackst0ne2018-10-268-16/+17
| | | * | | | | Update other linksblackst0ne2018-10-2614-23/+25
| | | * | | | | Make new merge request URL more friendly when pushing codeblackst0ne2018-10-236-9/+15
| | * | | | | | Merge branch 'ml-qa-push-private-token' into 'master'Dan Davison2018-10-292-1/+33
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Add e2e test to push using a private tokenml-qa-push-private-tokenMark Lapierre2018-10-292-1/+33
| | * | | | | | Merge branch '53273-update-moment-to-2-22-2' into 'master'Mike Greiling2018-10-292-6/+6
| | |\ \ \ \ \ \
| | | * | | | | | Update moment to 2.22.2Takuya Noguchi2018-10-282-6/+6
| | | | |_|/ / / | | | |/| | | |
| | * | | | | | Merge branch 'pages-1-3-0' into 'master'Robert Speicher2018-10-291-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Update GitLab Pages to v1.3.0Nick Thomas2018-10-291-1/+1
| | * | | | | | | Merge branch 'rails5-deprecated-uniq' into 'master'Robert Speicher2018-10-296-6/+11
| | |\ \ \ \ \ \ \
| | | * | | | | | | Replace deprecated uniq on a Relation with distinctJasper Maes2018-10-266-6/+11
| | * | | | | | | | Merge branch '5979_rename_sast_container_gitlab_features-ce' into 'master'Kamil Trzciński2018-10-291-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Rename 'sast_container' licensed feature5979_rename_sast_container_gitlab_features-ceKamil Trzciński2018-10-291-1/+1
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | Merge branch 'sh-bump-whitequark-parser' into 'master'Robert Speicher2018-10-291-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Upgrade whitequark/parser to 2.5.3.0sh-bump-whitequark-parserStan Hu2018-10-281-1/+1
| | * | | | | | | | | Merge branch 'winh-delete-job-spec' into 'master'Filipa Lacerda2018-10-291-265/+0
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | | * | | | | | | | Delete job_spec.jsWinnie Hellmann2018-10-291-265/+0
| | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | Merge branch 'gt-truncate-milestone-title-on-collapsed-sidebar' into 'master'Clement Ho2018-10-292-1/+6
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Truncate milestone title on collapsed sidebarGeorge Tsiolis2018-10-262-1/+6
| | * | | | | | | | Merge branch '52122-fix-broken-whitespace-button' into 'master'Phil Hughes2018-10-294-7/+178
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix broken "Show whitespace changes" button on MR "Changes" tabJacques Erasmus2018-10-294-7/+178
| | |/ / / / / / / /
| | * | | | | | | | Merge branch '45669-table-in-jobs-on-pipeline' into 'master'Nick Thomas2018-10-296-52/+64
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | Remove all tables from Pipeline page when there is no job for the PipelineTakuya Noguchi2018-10-296-52/+64
| | |/ / / / / / /