summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | Add UT for cherry-pick of an existing merge that is not foundSaverio Miroddi2017-08-211-19/+30
| | | | | | | | | | | | |
| | * | | | | | | | | | | Change a variable name in Commit#cherry_pick_descriptionSaverio Miroddi2017-08-211-4/+4
| | | | | | | | | | | | |
| | * | | | | | | | | | | Reverse order of commits in MR cherry-pick messageSaverio Miroddi2017-08-212-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also improved the UT for better documenting this change.
| | * | | | | | | | | | | Remove redundant statement part in a test suiteSaverio Miroddi2017-08-181-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Correct the cherry-pick message for merge commitsSaverio Miroddi2017-08-175-23/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The list of commits must be generated from the merge request, not from a diff of the branches.
| | * | | | | | | | | | | Extended UTs for the new cherry-pick message formatSaverio Miroddi2017-08-162-1/+28
| | | | | | | | | | | | |
| | * | | | | | | | | | | Fix build failures related to cherry-pick message changesSaverio Miroddi2017-08-162-2/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add support for start project to commit cherry-pick descriptionSaverio Miroddi2017-08-152-5/+5
| | | | | | | | | | | | |
| | * | | | | | | | | | | Made commit cherry-pick message more standardSaverio Miroddi2017-08-151-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the `cherry pick -x` format for the first line, and the interactive rebase format for the commits in the merge, in case of merge commit
| | * | | | | | | | | | | Extracted cherry-pick description in ::CommitSaverio Miroddi2017-08-151-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also fixes the inconsistency between non/merge commits in the number of newlines introduced.
| | * | | | | | | | | | | Merge branch 'master' into sm-cherry-pick-list-commits-in-messageSaverio Miroddi2017-08-15461-2658/+6715
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add 'from commit' information to cherry-picked commitsSaverio Miroddi2017-08-102-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store the original commit in the commit message. In case of merge commit, the commits added to the start branch are also listed.
| * | | | | | | | | | | | | Merge branch '35686-unescape-wiki-title' into 'master'Sean McGivern2017-09-013-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unescape HTML characters in Wiki title Closes #35686 See merge request !13942
| | * | | | | | | | | | | | | Unescape HTML characters in Wiki titleJacopo2017-08-303-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The special characters of a wiki title are now escaped correctly.
| * | | | | | | | | | | | | | Merge branch 'issue_36820' into 'master'Sean McGivern2017-09-013-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove closing external issues by reference error Closes #36820 See merge request !13910
| | * | | | | | | | | | | | | | Remove closing external issues by reference errorissue_36820Felipe Artur2017-08-313-0/+9
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch '36061-mr-ref-instrument' into 'master'Sean McGivern2017-09-012-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instrument MergeRequest#fetch_ref See merge request !13980
| | * | | | | | | | | | | | | | | Instrument MergeRequest#fetch_ref36061-mr-ref-instrumentJarka Kadlecova2017-09-012-0/+6
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'rs-api-use-project-requirements' into 'master'Sean McGivern2017-09-0132-35/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Use defined project requirements See merge request !13960
| | * | | | | | | | | | | | | | | | API: Use defined project requirementsrs-api-use-project-requirementsRobert Schilling2017-08-3132-35/+35
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'rouge-2.2.1' into 'master'Sean McGivern2017-09-012-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump rouge to 2.2.1 See merge request !13887
| | * | | | | | | | | | | | | | | | | Bump rouge to 2.2.1pbr2017-08-292-1/+6
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'gitaly-post-upload-pack-mandatory' into 'master'Douwe Maan2017-09-013-18/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Gitaly PostUploadPack mandatory Closes gitaly#184 and gitaly#219 See merge request !13953
| | * | | | | | | | | | | | | | | | | Make Gitaly PostUploadPack mandatoryJacob Vosmaer (GitLab)2017-09-013-18/+9
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge branch 'enable-new-navigaton-by-default' into 'master'Tim Zallmann2017-09-0143-172/+133
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the new navigation by default See merge request !13387
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into enable-new-navigaton-by-defaultenable-new-navigaton-by-defaultPhil Hughes2017-08-30215-2768/+5720
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | more navigation spec fixesPhil Hughes2017-08-303-7/+7
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | more spinach fixesPhil Hughes2017-08-303-4/+4
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | spinach test updatesPhil Hughes2017-08-3011-17/+23
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | spec updatesPhil Hughes2017-08-293-0/+6
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | fixed boards specsPhil Hughes2017-08-291-0/+2
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | more spec fixesPhil Hughes2017-08-2910-26/+27
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | spec updatesPhil Hughes2017-08-299-81/+41
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | layout-nav test check fixPhil Hughes2017-08-291-4/+4
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | fixed up a bunch of specsPhil Hughes2017-08-297-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some caused by webkit prefixes
| | * | | | | | | | | | | | | | | | | | added logo ID to top barPhil Hughes2017-08-292-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed flexbox not working in phantomjs
| | * | | | | | | | | | | | | | | | | | Enable the new navigation by defaultPhil Hughes2017-08-294-25/+1
| | | |_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch '37194-fix-mr-widget-merge-button-dropdown-caret' into 'master'Phil Hughes2017-09-012-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Merge when pipeline succeeds" button dropdown caret icon horizontal alignment Closes #37194 See merge request !13965
| | * | | | | | | | | | | | | | | | | | Fix merge button dropdown caret horizontal alignment37194-fix-mr-widget-merge-button-dropdown-caretEric Eastwood2017-08-312-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37194 It looks like this regressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12601 when we switched from `fa-caret-down` to `fa-chevron-down`
| * | | | | | | | | | | | | | | | | | | Merge branch 'gitaly-shell-redis' into 'master'Dmitriy Zaporozhets2017-09-015-1/+190
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement /internal/post_receive unified endpoint for PostReceive tasks See merge request !13916
| | * | | | | | | | | | | | | | | | | | Implement /internal/post_receive unified endpoint for PostReceive tasksgitaly-shell-redisAlejandro Rodríguez2017-08-315-1/+190
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'fix/npm-security-updates' into 'master'Clement Ho2017-08-313-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade brace-expansion NPM package due to security issue See merge request !13665
| | * | | | | | | | | | | | | | | | | | | Upgrade brace-expansion NPM package due to security issueMarkus Koller2017-08-283-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://nodesecurity.io/advisories/338
| * | | | | | | | | | | | | | | | | | | | Merge branch 'pretty-time-refactor' into 'master'Jacob Schatz2017-08-312-6/+88
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for custom daysPerWeek and hoursPerDay to prettyTime.parseSeconds Closes gitlab-ee#3298 See merge request !13966
| | * | | | | | | | | | | | | | | | | | | | Add support for custom daysPerWeek and hoursPerDay to prettyTime.parseSeconds.pretty-time-refactorBryce Johnson2017-08-312-6/+88
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'docs-article-fix-date' into 'master'Achilleas Pipinellis2017-08-312-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix article date See merge request !13968
| | * | | | | | | | | | | | | | | | | | | | | fix dateMarcia Ramos2017-08-312-2/+2
| |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'docs-article-laravel-with-ci-and-envoy' into 'master'Marcia Ramos2017-08-3118-1/+683
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs - new article: Test and Deploy Laravel (PHP) Apps with GitLab CI and Envoy See merge request !13911
| | * | | | | | | | | | | | | | | | | | | | | rename imageMarcia Ramos2017-08-311-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | social sharing image
| | * | | | | | | | | | | | | | | | | | | | | adjust dateMarcia Ramos2017-08-312-3/+3
| | | | | | | | | | | | | | | | | | | | | | |
View Lorry Controller Status