summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Resolve Gemfile.lock conflictsadd_ldap_tls_optionsDrew Blessing2018-07-172-3/+3
* Allow raw `tls_options` to be passed in LDAP configurationDrew Blessing2018-07-173-23/+53
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDrew Blessing2018-07-114599-76407/+116382
|\
| * Merge branch '20700-use-danger-gem' into 'master'Robert Speicher2018-07-119-0/+252
| |\
| | * Autocorrect RuboCop violations in danger/**/DangerfileRobert Speicher2018-07-115-12/+5
| | * Wrap DB paths in backticks in the Danger checkRémy Coutable2018-07-111-1/+1
| | * Revert "Modify locale/gitlab.pot for debugging purpose"Rémy Coutable2018-07-111-8/+13
| | * Revert "Moving 400 lines of code"Rémy Coutable2018-07-112-315/+13
| | * Revert "Add a fake change to Gemfile"Rémy Coutable2018-07-111-2/+0
| | * Revert "Add a new fake migration file"Rémy Coutable2018-07-111-0/+0
| | * Fix "Database Team" typo for DangerYorick Peterse2018-07-111-1/+1
| | * Tweak the Danger settings for DB changesYorick Peterse2018-07-111-8/+61
| | * Improve Danger files after first reviewRémy Coutable2018-07-117-49/+117
| | * Modify locale/gitlab.pot for debugging purposeRémy Coutable2018-07-111-13/+8
| | * Moving 400 lines of codeRémy Coutable2018-07-112-13/+315
| | * Add a fake change to GemfileRémy Coutable2018-07-111-0/+2
| | * Add a new fake migration fileRémy Coutable2018-07-111-0/+0
| | * Start to use Danger for automating MR reviewsRémy Coutable2018-07-119-0/+138
| * | Merge branch '48934' into 'master'Mike Greiling2018-07-115-2/+29
| |\ \
| | * | Fix #48934 - Focus on text input on danger confirmationJamie Schembri2018-07-065-2/+29
| * | | Merge branch '49021-preserve-test-run-artifacts-when-running-gitlab-qa-multip...Grzegorz Bizon2018-07-112-1/+5
| |\ \ \
| | * | | [QA] Ensure screenshots are save in subfolder per QA runRémy Coutable2018-07-112-1/+5
| * | | | Merge branch 'sh-truncate-changelog-filenames' into 'master'Robert Speicher2018-07-112-4/+24
| |\ \ \ \
| | * | | | Truncate filenames created by bin/changelog to 140 charactersStan Hu2018-07-112-4/+24
| * | | | | Merge branch 'fix-mr-widget-border' into 'master'Filipa Lacerda2018-07-112-7/+1
| |\ \ \ \ \
| | * | | | | Fix MR widget borderAnnabel Dunstone Gray2018-07-112-7/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'revert-todos-epic' into 'master'Yorick Peterse2018-07-1130-640/+184
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Revert "Merge branch 'ee-5481-epic-todos' into 'master'"Jarka Kadlecová2018-07-1130-640/+184
| |/ / / /
| * | | | Merge branch 'fix-no-method-error-on-nil' into 'master'Kamil Trzciński2018-07-112-1/+21
| |\ \ \ \
| | * | | | Fix an exception seen using the online terminalNick Thomas2018-07-112-1/+21
| * | | | | Merge branch '48237-toggle-file-comments' into 'master'Phil Hughes2018-07-1114-92/+378
| |\ \ \ \ \
| | * | | | | Adds specs for toggleFileDiscussions actionFilipa Lacerda2018-07-112-3/+45
| | * | | | | Adds specs for getters in merge request vuex diff moduleFilipa Lacerda2018-07-113-95/+30
| | * | | | | Merge branch 'master' into 48237-toggle-file-commentsFilipa Lacerda2018-07-10319-1960/+2700
| | |\ \ \ \ \
| | * | | | | | Fixes toggle discussion button not expanding collapsed discussionsFilipa Lacerda2018-07-107-6/+94
| | * | | | | | Removes hardcoded and unused propFilipa Lacerda2018-07-091-4/+0
| * | | | | | | Merge branch 'milestone-tests' into 'master'Rémy Coutable2018-07-1116-18/+151
| |\ \ \ \ \ \ \
| | * | | | | | | Milestone testsDan Davison2018-07-1116-18/+151
| |/ / / / / / /
| * | | | | | | Fix long changelog file nameSean McGivern2018-07-111-0/+0
| * | | | | | | Merge branch '42751-rename-master-to-maintainer-2' into 'master'Dmitriy Zaporozhets2018-07-11495-1596/+1631
| |\ \ \ \ \ \ \
| | * | | | | | | Resolve "Rename the `Master` role to `Maintainer`" BackendMark Chao2018-07-11495-1596/+1631
| |/ / / / / / /
| * | | | | | | Merge branch '49114-add-gitaly-servers-to-admin-overview-navigation-menu' int...Douwe Maan2018-07-112-2/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Add Gitaly Servers to Admin > Overview menu49114-add-gitaly-servers-to-admin-overview-navigation-menuGabriel Mazetto2018-07-112-2/+11
| * | | | | | | | Merge branch '45592-nomethoderror-undefined-method-commit-for-nil-nilclass-in...Douwe Maan2018-07-113-8/+42
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix ProcessCommitWorker when upstream project is deletedSean McGivern2018-07-103-8/+42
| * | | | | | | | | Merge branch 'sh-bump-gitlab-shell' into 'master'Douwe Maan2018-07-111-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bump gitlab-shell to 7.1.5Stan Hu2018-07-101-1/+1
| * | | | | | | | | | Merge branch 'make-sure-env-name-not-ending-in-slash' into 'master'Nick Thomas2018-07-111-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Make sure we're matching the same way.Lin Jen-Shin2018-07-101-2/+2
| * | | | | | | | | | | Merge branch 'gitaly-0.112.0' into 'master'Sean McGivern2018-07-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \