Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resolve Gemfile.lock conflictsadd_ldap_tls_options | Drew Blessing | 2018-07-17 | 2 | -3/+3 |
* | Allow raw `tls_options` to be passed in LDAP configuration | Drew Blessing | 2018-07-17 | 3 | -23/+53 |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Drew Blessing | 2018-07-11 | 4599 | -76407/+116382 |
|\ | |||||
| * | Merge branch '20700-use-danger-gem' into 'master' | Robert Speicher | 2018-07-11 | 9 | -0/+252 |
| |\ | |||||
| | * | Autocorrect RuboCop violations in danger/**/Dangerfile | Robert Speicher | 2018-07-11 | 5 | -12/+5 |
| | * | Wrap DB paths in backticks in the Danger check | Rémy Coutable | 2018-07-11 | 1 | -1/+1 |
| | * | Revert "Modify locale/gitlab.pot for debugging purpose" | Rémy Coutable | 2018-07-11 | 1 | -8/+13 |
| | * | Revert "Moving 400 lines of code" | Rémy Coutable | 2018-07-11 | 2 | -315/+13 |
| | * | Revert "Add a fake change to Gemfile" | Rémy Coutable | 2018-07-11 | 1 | -2/+0 |
| | * | Revert "Add a new fake migration file" | Rémy Coutable | 2018-07-11 | 1 | -0/+0 |
| | * | Fix "Database Team" typo for Danger | Yorick Peterse | 2018-07-11 | 1 | -1/+1 |
| | * | Tweak the Danger settings for DB changes | Yorick Peterse | 2018-07-11 | 1 | -8/+61 |
| | * | Improve Danger files after first review | Rémy Coutable | 2018-07-11 | 7 | -49/+117 |
| | * | Modify locale/gitlab.pot for debugging purpose | Rémy Coutable | 2018-07-11 | 1 | -13/+8 |
| | * | Moving 400 lines of code | Rémy Coutable | 2018-07-11 | 2 | -13/+315 |
| | * | Add a fake change to Gemfile | Rémy Coutable | 2018-07-11 | 1 | -0/+2 |
| | * | Add a new fake migration file | Rémy Coutable | 2018-07-11 | 1 | -0/+0 |
| | * | Start to use Danger for automating MR reviews | Rémy Coutable | 2018-07-11 | 9 | -0/+138 |
| * | | Merge branch '48934' into 'master' | Mike Greiling | 2018-07-11 | 5 | -2/+29 |
| |\ \ | |||||
| | * | | Fix #48934 - Focus on text input on danger confirmation | Jamie Schembri | 2018-07-06 | 5 | -2/+29 |
| * | | | Merge branch '49021-preserve-test-run-artifacts-when-running-gitlab-qa-multip... | Grzegorz Bizon | 2018-07-11 | 2 | -1/+5 |
| |\ \ \ | |||||
| | * | | | [QA] Ensure screenshots are save in subfolder per QA run | Rémy Coutable | 2018-07-11 | 2 | -1/+5 |
| * | | | | Merge branch 'sh-truncate-changelog-filenames' into 'master' | Robert Speicher | 2018-07-11 | 2 | -4/+24 |
| |\ \ \ \ | |||||
| | * | | | | Truncate filenames created by bin/changelog to 140 characters | Stan Hu | 2018-07-11 | 2 | -4/+24 |
| * | | | | | Merge branch 'fix-mr-widget-border' into 'master' | Filipa Lacerda | 2018-07-11 | 2 | -7/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix MR widget border | Annabel Dunstone Gray | 2018-07-11 | 2 | -7/+1 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge branch 'revert-todos-epic' into 'master' | Yorick Peterse | 2018-07-11 | 30 | -640/+184 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Revert "Merge branch 'ee-5481-epic-todos' into 'master'" | Jarka Kadlecová | 2018-07-11 | 30 | -640/+184 |
| |/ / / / | |||||
| * | | | | Merge branch 'fix-no-method-error-on-nil' into 'master' | Kamil Trzciński | 2018-07-11 | 2 | -1/+21 |
| |\ \ \ \ | |||||
| | * | | | | Fix an exception seen using the online terminal | Nick Thomas | 2018-07-11 | 2 | -1/+21 |
| * | | | | | Merge branch '48237-toggle-file-comments' into 'master' | Phil Hughes | 2018-07-11 | 14 | -92/+378 |
| |\ \ \ \ \ | |||||
| | * | | | | | Adds specs for toggleFileDiscussions action | Filipa Lacerda | 2018-07-11 | 2 | -3/+45 |
| | * | | | | | Adds specs for getters in merge request vuex diff module | Filipa Lacerda | 2018-07-11 | 3 | -95/+30 |
| | * | | | | | Merge branch 'master' into 48237-toggle-file-comments | Filipa Lacerda | 2018-07-10 | 319 | -1960/+2700 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Fixes toggle discussion button not expanding collapsed discussions | Filipa Lacerda | 2018-07-10 | 7 | -6/+94 |
| | * | | | | | | Removes hardcoded and unused prop | Filipa Lacerda | 2018-07-09 | 1 | -4/+0 |
| * | | | | | | | Merge branch 'milestone-tests' into 'master' | Rémy Coutable | 2018-07-11 | 16 | -18/+151 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Milestone tests | Dan Davison | 2018-07-11 | 16 | -18/+151 |
| |/ / / / / / / | |||||
| * | | | | | | | Fix long changelog file name | Sean McGivern | 2018-07-11 | 1 | -0/+0 |
| * | | | | | | | Merge branch '42751-rename-master-to-maintainer-2' into 'master' | Dmitriy Zaporozhets | 2018-07-11 | 495 | -1596/+1631 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Resolve "Rename the `Master` role to `Maintainer`" Backend | Mark Chao | 2018-07-11 | 495 | -1596/+1631 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch '49114-add-gitaly-servers-to-admin-overview-navigation-menu' int... | Douwe Maan | 2018-07-11 | 2 | -2/+11 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add Gitaly Servers to Admin > Overview menu49114-add-gitaly-servers-to-admin-overview-navigation-menu | Gabriel Mazetto | 2018-07-11 | 2 | -2/+11 |
| * | | | | | | | | Merge branch '45592-nomethoderror-undefined-method-commit-for-nil-nilclass-in... | Douwe Maan | 2018-07-11 | 3 | -8/+42 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix ProcessCommitWorker when upstream project is deleted | Sean McGivern | 2018-07-10 | 3 | -8/+42 |
| * | | | | | | | | | Merge branch 'sh-bump-gitlab-shell' into 'master' | Douwe Maan | 2018-07-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Bump gitlab-shell to 7.1.5 | Stan Hu | 2018-07-10 | 1 | -1/+1 |
| * | | | | | | | | | | Merge branch 'make-sure-env-name-not-ending-in-slash' into 'master' | Nick Thomas | 2018-07-11 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Make sure we're matching the same way. | Lin Jen-Shin | 2018-07-10 | 1 | -2/+2 |
| * | | | | | | | | | | | Merge branch 'gitaly-0.112.0' into 'master' | Sean McGivern | 2018-07-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ |