summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'blackst0ne-rails5-set-request-format-in--commits-controller' in...Rémy Coutable2018-06-211-0/+14
|\
| * [Rails5] Set request.format in commits_controllerblackst0ne-rails5-set-request-format-in--commits-controllerblackst0ne2018-06-201-0/+14
* | Merge branch 'dm-label-reference-period' into 'master'Sean McGivern2018-06-211-5/+10
|\ \
| * | Properly detect label reference if followed by period or question markDouwe Maan2018-06-181-5/+10
* | | Merge branch 'bvl-finder-methods-cop' into 'master'Douwe Maan2018-06-211-1/+0
|\ \ \
| * | | Add a cop for `FinderMethods`bvl-finder-methods-copBob Van Landuyt2018-06-201-1/+0
* | | | Merge branch 'sh-fallback-to-first-tab-signin' into 'master'Clement Ho2018-06-201-0/+5
|\ \ \ \
| * | | | Fall back to the first sign-in tab if the local storage value is badStan Hu2018-06-201-0/+5
| | |_|/ | |/| |
* | | | Merge branch 'jr-48133-web-ide-commit-ellipsis' into 'master'Tim Zallmann2018-06-201-1/+1
|\ \ \ \
| * | | | Add ellipsis to Web IDE commit buttonjr-48133-web-ide-commit-ellipsisJames Ramsay2018-06-201-1/+1
* | | | | Merge branch '47488-remove-unmergeable-notification-for-no-commits' into 'mas...Robert Speicher2018-06-205-24/+13
|\ \ \ \ \
| * | | | | Notify only when unmergeable due to conflictMark Chao2018-06-205-24/+13
* | | | | | Merge branch '47964-custom-logo-rendering-improperly-on-sign-in-page-2' into ...Mike Greiling2018-06-201-1/+1
|\ \ \ \ \ \
| * | | | | | Fix navigation bar center logo for custom logosClement Ho2018-06-201-1/+1
| |/ / / / /
* | | | | | Backport code from gitlab-ee!6182Lukas Eipert2018-06-202-10/+55
* | | | | | Merge branch 'highlight-cluster-settings-message' into 'master'Rémy Coutable2018-06-201-2/+3
|\ \ \ \ \ \
| * | | | | | Highlight cluster settings messageGeorge Tsiolis2018-06-191-2/+3
* | | | | | | Merge branch '48153-date-selection-dialog-broken-when-creating-a-new-mileston...Rémy Coutable2018-06-201-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Prevent browser autocomplete for milestone date fieldsMark Fletcher2018-06-201-2/+2
* | | | | | | | Merge branch 'leipert-eslint-report-unused-directives' into 'master'Mike Greiling2018-06-2074-97/+83
|\ \ \ \ \ \ \ \
| * | | | | | | | remove all unused eslint-disable rulesLukas Eipert2018-06-2074-97/+83
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Revert "Merge branch 'jivl-fix-focused-links-missing-underline' into 'master'"Clement Ho2018-06-202-6/+0
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge branch 'zj-can-be-merged' into 'master'Douwe Maan2018-06-201-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Move mergablility check to Gitalyzj-can-be-mergedZeger-Jan van de Weg2018-06-201-1/+1
* | | | | | | | Merge branch '47631-operations-kubernetes-option-is-always-visible-when-repos...Rémy Coutable2018-06-201-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Operations and Kubernetes items are now omitted in the sidebar when repositor...47631-operations-kubernetes-option-is-always-visible-when-repository-or-builds-are-disabledTiago Botelho2018-06-201-0/+1
* | | | | | | | Resolve "Unable to install Prometheus on Clusters: 'Error: Chart incompatible...Mayra Cabrera2018-06-201-1/+2
* | | | | | | | Merge branch 'rails5-fix-48142' into 'master'Rémy Coutable2018-06-201-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Rails5 fix Admin::HooksControllerJasper Maes2018-06-201-1/+1
* | | | | | | | | Merge branch '48100-fix-branch-not-shown' into 'master'Rémy Coutable2018-06-201-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | The json keys of ref switcher should not be translatedhiroponz/gitlab-ce-48100-fix-branch-not-shownHiroyuki Sato2018-06-201-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'rails5-fix-48141' into 'master'Rémy Coutable2018-06-201-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Rails5 fix expected: 0 times with any arguments received: 1 time with argume...Jasper Maes2018-06-201-1/+1
| |/ / / / / / /
* | | | | | | | More gitaly disk access blocksJacob Vosmaer (GitLab)2018-06-202-1/+5
* | | | | | | | Merge branch '47959-rails5-redis-timewithzone' into 'master'Sean McGivern2018-06-201-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix redis_cacheable deserialization47959-rails5-redis-timewithzoneMario de la Ossa2018-06-191-1/+1
* | | | | | | | Updated horizontal ellipsis icon for text-expanderConstance Okoghenun2018-06-204-6/+22
| |/ / / / / / |/| | | | | |
* | | | | | | Resolve "Branch name status color is not correct anymore"Clement Ho2018-06-193-5/+9
* | | | | | | Resolve "Remove “commented” from comment system notes"Constance Okoghenun2018-06-192-3/+0
* | | | | | | Merge branch 'jivl-fix-cancel-auto-merge-button-height' into 'master'Clement Ho2018-06-191-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix cancel automatic merge button heightJose2018-06-191-0/+1
* | | | | | | | Merge branch 'jivl-fix-focused-links-missing-underline' into 'master'Tim Zallmann2018-06-192-0/+6
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix missing underline on focus states for anchor tagsjivl-fix-focused-links-missing-underlineJose2018-06-152-0/+6
* | | | | | | | Merge branch '48047-project-integrations' into 'master'Clement Ho2018-06-191-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix integration table widths48047-project-integrationsAnnabel Dunstone Gray2018-06-181-1/+1
* | | | | | | | Merge branch 'zj-fork-mandatory' into 'master'Douwe Maan2018-06-191-21/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Move forking to Gitalyzj-fork-mandatoryZeger-Jan van de Weg2018-06-191-21/+5
* | | | | | | | | Merge branch 'zj-counting-commits' into 'master'Douwe Maan2018-06-191-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Counting commits is done by Gitalyzj-counting-commitsZeger-Jan van de Weg2018-06-191-1/+4
* | | | | | | | | | Merge branch '45487-slack-tag-push-notifs' into 'master'Sean McGivern2018-06-191-0/+1
|\ \ \ \ \ \ \ \ \ \