summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qa_issue_177' into 'master'Grzegorz Bizon2018-02-151-0/+4
|\
| * Wait for create merge request button to appearqa_issue_177Felipe Artur2018-02-141-0/+4
* | Merge branch 'change/strip-whitespace-from-username-input#42637' into 'master'Rémy Coutable2018-02-153-1/+14
|\ \
| * | Strip whitespace from username/login value for user lookupPeter Lauck2018-02-133-1/+14
* | | Merge branch '43231-document-the-instance-level-auto-devops-domain-option' in...Achilleas Pipinellis2018-02-151-1/+3
|\ \ \
| * | | Add instance-wide domain info43231-document-the-instance-level-auto-devops-domain-optionMatija Čupić2018-02-141-1/+3
* | | | Merge branch 'pipeline-schedule-webpack' into 'master'Filipa Lacerda2018-02-1516-19/+21
|\ \ \ \
| * | | | Converted pipeline_schedules bundles into automatic webpack entriespipeline-schedule-webpackPhil Hughes2018-02-1516-19/+21
* | | | | Merge branch '31049-pages-domains-should-be-added-to-publicsuffix-org-docs' i...Grzegorz Bizon2018-02-151-0/+15
|\ \ \ \ \
| * | | | | Document publicsuffix.org and GitLab PagesNick Thomas2018-02-151-0/+15
* | | | | | Merge branch 'patch-29' into 'master'Sean McGivern2018-02-151-1/+13
|\ \ \ \ \ \
| * | | | | | Added PlantUML server using dockermorph0272018-02-021-1/+13
* | | | | | | Merge branch 'docs-edits' into 'master'Sean McGivern2018-02-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Update index.md with minor grammatical editAnn Lette2018-02-041-1/+1
* | | | | | | | Merge branch 'patch-19' into 'master'Sean McGivern2018-02-151-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove double negativeBen Bodenmiller2018-02-111-1/+1
* | | | | | | | | Merge branch 'sh-fix-error-500-licensee' into 'master'Douwe Maan2018-02-152-1/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove head_commit callsh-fix-error-500-licenseeStan Hu2018-02-141-1/+0
| * | | | | | | | | Simplify license generator error handlingStan Hu2018-02-142-4/+3
| * | | | | | | | | Remove use of catching Rugged exceptionsStan Hu2018-02-141-1/+4
| * | | | | | | | | Fix Error 500s loading repositories with no master branchStan Hu2018-02-142-1/+20
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'move-profile-to-rspec' into 'master'Rémy Coutable2018-02-157-330/+231
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move spinach profile tests to RSpecSemyon Pupkov2018-02-157-330/+231
* | | | | | | | | | Merge branch '39607-fix-avatar--vertical-align' into 'master'Tim Zallmann2018-02-152-2/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | changelog addedLaszlo Karpati2018-02-131-0/+5
| * | | | | | | | | | fix author_link's vertical alignLaszlo Karpati2018-02-131-2/+0
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ce-rc/move-more-ee-only-spec-files' into 'master'Sean McGivern2018-02-153-7/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Port some changes from gitlab-ee!4532 back to CEce-rc/move-more-ee-only-spec-filesRémy Coutable2018-02-143-7/+8
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fj-37528-error-after-disabling-ldap' into 'master'Douwe Maan2018-02-157-2/+68
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed user synced attributes metadata after removing current providerFrancisco Javier López2018-02-157-2/+68
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'jej/fix-slow-lfs-object-check' into 'master'Douwe Maan2018-02-155-9/+33
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Only check LFS integrity for first branch in pushjej/fix-slow-lfs-object-checkJames Edwards-Jones2018-02-155-9/+33
* | | | | | | | | | Merge branch 'group-milestones-rspec' into 'master'Rémy Coutable2018-02-153-220/+114
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move spinach group milestones test to RSpecSemyon Pupkov2018-02-153-220/+114
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'group-search-members-rspec' into 'master'Rémy Coutable2018-02-153-27/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move feature group members search test to RSpecSemyon Pupkov2018-02-153-27/+29
* | | | | | | | | | | Merge branch '35530-teleporting-emoji-fix' into 'master'Fatih Acet2018-02-153-4/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add changelog entryJared Deckard2018-02-131-0/+5
| * | | | | | | | | | | Don't reset the awards block when the emoji search is clickedJared Deckard2018-02-071-3/+1
| * | | | | | | | | | | The emoji menu should not close when the search box is clickedJared Deckard2018-02-071-1/+12
* | | | | | | | | | | | Merge branch '34130-null-pipes' into 'master'Fatih Acet2018-02-153-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Prevent MR Widget error when no CI configured34130-null-pipesSimon Knox2018-02-123-0/+15
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sh-add-env-variables-for-ldap-qa' into 'master'Grzegorz Bizon2018-02-153-2/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add LDAP_USERNAME and LDAP_PASSWORD user environment variables for QAsh-add-env-variables-for-ldap-qaStan Hu2018-02-143-2/+18
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-28' into 'master'Stan Hu (Admin)2018-02-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add the missing "Security Products" Team label and sort them alphabeticallyOlivier Gonzalez2018-02-061-1/+1
* | | | | | | | | | | Merge branch '43271-remove-seeded-root-user-project-limit' into 'master'Stan Hu2018-02-151-1/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove root user 100 project limit to rely on default 100,00043271-remove-seeded-root-user-project-limitEric Eastwood2018-02-141-1/+0
* | | | | | | | | | | | Merge branch 'mc/fix/project-variables-scope' into 'master'Kamil Trzciński2018-02-146-6/+94
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Improve validation message and add changelogmc/fix/project-variables-scopeKamil Trzciński2018-02-143-2/+7