summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use expect_next_instance_of to replace expect_any_instance_ofunify-destroy_service_spec.rbLin Jen-Shin2018-06-211-2/+6
* Merge branch 'ce-6436-6149-unify-project_creator_spec' into 'master'Robert Speicher2018-06-218-11/+78
|\
| * Add docs around expect_next_instance_ofce-6436-6149-unify-project_creator_specLin Jen-Shin2018-06-211-0/+48
| * Implement `expect_next_instance_of` and use itLin Jen-Shin2018-06-217-11/+30
* | Merge branch 'no-multi-assign-follow-up' into 'master'Clement Ho2018-06-216-18/+17
|\ \
| * | Follow-up to !19808: Split up for-loop initializationsgfyoung2018-06-216-18/+17
|/ /
* | Merge branch 'restore-custom-hooks-wiki' into 'master'Douwe Maan2018-06-211-0/+2
|\ \
| * | Restore custom hooks for wikirestore-custom-hooks-wikiAhmad Hassan2018-06-211-0/+2
* | | Merge branch 'changes_tab_vue_refactoring' into 'master'Tim Zallmann2018-06-21221-2282/+8933
|\ \ \ | |/ / |/| |
| * | Changes tab VUE refactoringFelipe Artur2018-06-21221-2282/+8933
|/ /
* | Merge branch 'blackst0ne-rails5-set-request-format-in--commits-controller' in...Rémy Coutable2018-06-212-0/+19
|\ \
| * | [Rails5] Set request.format in commits_controllerblackst0ne-rails5-set-request-format-in--commits-controllerblackst0ne2018-06-202-0/+19
* | | Merge branch 'da-usage-ping' into 'master'Sean McGivern2018-06-212-23/+24
|\ \ \
| * | | Add enabled prefix to feature keys to be consistent with other keysda-usage-pingDouglas Barbosa Alexandre2018-06-202-23/+24
* | | | Merge branch 'dm-label-reference-period' into 'master'Sean McGivern2018-06-213-8/+20
|\ \ \ \
| * | | | Add spec for more examples of trailing punctuation that should be ignoreddm-label-reference-periodDouwe Maan2018-06-201-3/+5
| * | | | Properly detect label reference if followed by period or question markDouwe Maan2018-06-183-7/+17
* | | | | Merge branch 'blackst0ne-rails5-fix-action-cable-mount-path' into 'master'Rémy Coutable2018-06-211-1/+1
|\ \ \ \ \
| * | | | | [Rails5] Fix ActionCable's mount_path configurationblackst0ne-rails5-fix-action-cable-mount-pathblackst0ne2018-06-211-1/+1
* | | | | | Merge branch 'rails5-fix-48140' into 'master'Rémy Coutable2018-06-213-0/+10
|\ \ \ \ \ \
| * | | | | | Rails 5 fix Capybara::ElementNotFound: Unable to find visible css #modal-reve...Jasper Maes2018-06-203-0/+10
* | | | | | | Merge branch 'zj-raw-changes-mandatory' into 'master'Douwe Maan2018-06-212-54/+29
|\ \ \ \ \ \ \
| * | | | | | | Raw changes calculation is Gitaly only nowZeger-Jan van de Weg2018-06-212-54/+29
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'bvl-finder-methods-cop' into 'master'Douwe Maan2018-06-215-4/+110
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add a cop for `FinderMethods`bvl-finder-methods-copBob Van Landuyt2018-06-205-4/+110
* | | | | | | Update VERSION to 11.1.0-prev11.1.0.preFilipa Lacerda2018-06-211-1/+1
* | | | | | | Update CHANGELOG.md for 11.0.0Filipa Lacerda2018-06-21214-1074/+240
* | | | | | | Merge branch 'MadLittleMods-master-patch-55656' into 'master'Filipa Lacerda2018-06-211-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix a couple Vuex typosMadLittleMods-master-patch-55656Eric Eastwood2018-06-201-2/+2
* | | | | | | | Merge branch 'docs-styleguidelines-nav' into 'master'Achilleas Pipinellis2018-06-211-2/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | clarify what "methods" aredocs-styleguidelines-navMarcia Ramos2018-06-201-3/+4
| * | | | | | | | Update styleguide.md with rules for navigation itemsMarcia Ramos2018-06-201-2/+15
* | | | | | | | | Merge branch 'mk/fix-n-plus-1-queries-in-uploads-check-rake-task' into 'master'Stan Hu2018-06-203-9/+39
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix documentation code blocksmk/fix-n-plus-1-queries-in-uploads-check-rake-taskMichael Kozono2018-06-201-0/+1
| * | | | | | | | Avoid N+1 queries while processing uploadsMichael Kozono2018-06-202-9/+38
* | | | | | | | | Merge branch 'sh-fallback-to-first-tab-signin' into 'master'Clement Ho2018-06-202-0/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fall back to the first sign-in tab if the local storage value is badStan Hu2018-06-202-0/+20
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'bvl-dont-generate-mo' into 'master'Rubén Dávila2018-06-202-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't generate `.mo` filesBob Van Landuyt2018-06-202-1/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jr-48133-web-ide-commit-ellipsis' into 'master'Tim Zallmann2018-06-202-1/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Add ellipsis to Web IDE commit buttonjr-48133-web-ide-commit-ellipsisJames Ramsay2018-06-202-1/+6
* | | | | | | | | Merge branch 'improve-scripts-trigger-build' into 'master'Robert Speicher2018-06-201-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ignore GitLab API hiccups in scripts/trigger-buildimprove-scripts-trigger-buildRémy Coutable2018-06-201-0/+4
* | | | | | | | | | Merge branch '48159-qa-specs-features-login-ldap_spec-rb-is-failing-after-htt...Robert Speicher2018-06-202-2/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [QA] Fix qa/qa/specs/features/login/ldap_spec.rb48159-qa-specs-features-login-ldap_spec-rb-is-failing-after-https-gitlab-com-gitlab-org-gitlab-ce-merge_requests-19964Rémy Coutable2018-06-202-2/+10
* | | | | | | | | | | Merge branch 'unify-lib-tasks' into 'master'Robert Speicher2018-06-202-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Unify flay.rake and gettext.rake from EEunify-lib-tasksLin Jen-Shin2018-06-212-2/+2
* | | | | | | | | | | | Merge branch '47488-remove-unmergeable-notification-for-no-commits' into 'mas...Robert Speicher2018-06-209-70/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix possiblilty of branch not found47488-remove-unmergeable-notification-for-no-commitsMark Chao2018-06-201-2/+5
| * | | | | | | | | | | Notify only when unmergeable due to conflictMark Chao2018-06-208-68/+28
| | |_|/ / / / / / / / | |/| | | | | | | | |