Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Skip projects filter on merge requests searchjprovazn-search-ee | Jan Provaznik | 2017-12-19 | 4 | -3/+29 |
* | Merge branch 'ee-ph-es-notes-module' into 'master' | Filipa Lacerda | 2017-12-18 | 8 | -24/+25 |
|\ | |||||
| * | Merge branch 'master' into 'ee-ph-es-notes-module' | Phil Hughes | 2017-12-18 | 13 | -370/+362 |
| |\ | |||||
| * | | EE port of ph-es-notes-module | Phil Hughes | 2017-12-18 | 8 | -24/+25 |
* | | | Merge branch 'osw-isolate-mr-widget-exposed-attributes-ee' into 'master' | Sean McGivern | 2017-12-18 | 18 | -107/+72 |
|\ \ \ | |||||
| * | | | Stop sending milestone and labels data over the wire for MR widget | Oswaldo Ferreira | 2017-12-16 | 18 | -107/+72 |
* | | | | Merge branch 'ee-41117-empty-state' into 'master' | Phil Hughes | 2017-12-18 | 2 | -520/+545 |
|\ \ \ \ | |||||
| * | | | | ee - Only render signout screen when user is signed out | Filipa Lacerda | 2017-12-18 | 2 | -520/+545 |
|/ / / / | |||||
* | | | | Merge branch 'patch-5' into 'master' | Marcia Ramos | 2017-12-18 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | With laravel's package auto-discovery, the composer install fails when it tri... | Samuel | 2017-11-10 | 1 | -1/+1 |
* | | | | Merge branch 'ee-ph-even-more-es-modules' into 'master' | Filipa Lacerda | 2017-12-18 | 13 | -370/+362 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | EE port of ph-even-more-es-modules | Phil Hughes | 2017-12-15 | 13 | -370/+362 |
* | | | | Merge branch 'qa/gb/gitlab-qa-factories-ee' into 'master' | Rémy Coutable | 2017-12-18 | 22 | -240/+234 |
|\ \ \ \ | |||||
| * | | | | Rename QA scenarios to make factory concept explicit / EE | Grzegorz Bizon | 2017-12-18 | 22 | -240/+234 |
|/ / / / | |||||
* | | | | Merge branch '41178-fix-weight-loading-spinner-in-boards' into 'master' | Phil Hughes | 2017-12-18 | 1 | -1/+0 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Fix loading spinner for the weight block | Eric Eastwood | 2017-12-15 | 1 | -1/+0 |
* | | | | Merge branch 'ee-38019-hide-runner-token' into 'master' | Clement Ho | 2017-12-16 | 10 | -49/+223 |
|\ \ \ \ | |||||
| * | | | | Hide runner token in CI/CD settings page | Eric Eastwood | 2017-12-15 | 10 | -49/+223 |
| |/ / / | |||||
* | | | | Merge branch 'fix-wording-add-clusters' into 'master' | Filipa Lacerda | 2017-12-15 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'fix-wording-add-clusters' of gitlab.com:gitlab-org/gitlab-ee in... | bikebilly | 2017-12-15 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into fix-wording-add-clusters | bikebilly | 2017-12-15 | 38 | -521/+1139 |
| | |\ \ \ \ | |||||
| | * | | | | | Fix wording in Add Cluster tooltip | bikebilly | 2017-12-15 | 2 | -2/+2 |
| * | | | | | | Fix wording in Add Cluster tooltip | bikebilly | 2017-12-15 | 2 | -2/+2 |
* | | | | | | | Update CHANGELOG.md for 10.2.5 | Michael Kozono | 2017-12-15 | 12 | -56/+20 |
* | | | | | | | Update CHANGELOG-EE.md for 10.2.5-ee | Michael Kozono | 2017-12-15 | 2 | -5/+7 |
* | | | | | | | Merge branch 'ce-to-ee-2017-12-14' into 'master' | Robert Speicher | 2017-12-15 | 171 | -1845/+2526 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into ce-to-ee-2017-12-14 | Nick Thomas | 2017-12-15 | 168 | -245/+267 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| * | | | | | | | Fix some EE-only specs | Nick Thomas | 2017-12-15 | 1 | -2/+2 |
| * | | | | | | | fixed popup_dialog.vue no longer existing | Phil Hughes | 2017-12-15 | 2 | -11/+4 |
| * | | | | | | | Merge remote-tracking branch 'ee/master' into ce-to-ee-2017-12-14 | Lin Jen-Shin | 2017-12-15 | 44 | -665/+1993 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | resolve app/assets/stylesheets/framework/variables.scss | Phil Hughes | 2017-12-15 | 1 | -3/+0 |
| * | | | | | | | Resolve all_queues.yml and sidekiq_config.rb | Lin Jen-Shin | 2017-12-15 | 2 | -7/+0 |
| * | | | | | | | Resolve conflicts in MR model spec | Zeger-Jan van de Weg | 2017-12-15 | 1 | -9/+0 |
| * | | | | | | | Resolve conflict in spec/models/ci/build_spec.rb | Rémy Coutable | 2017-12-15 | 1 | -3/+0 |
| * | | | | | | | Resolve conflicts in member controllers, presenters, and views | Rémy Coutable | 2017-12-15 | 5 | -18/+1 |
| * | | | | | | | Resolve conflict in app/assets/stylesheets/pages/boards.scss | Winnie Hellmann | 2017-12-14 | 1 | -3/+0 |
| * | | | | | | | [ci skip] Resolve clusters/index.html.haml conflict | Luke Bennett | 2017-12-14 | 1 | -3/+0 |
| * | | | | | | | [ci skip] Resolve gitlab-svgs assets conflicts | Luke Bennett | 2017-12-14 | 2 | -10/+2 |
| * | | | | | | | Resolve conflict for mr_title | Clement Ho | 2017-12-14 | 1 | -4/+0 |
| * | | | | | | | Fix conflicts for: | Filipa Lacerda | 2017-12-14 | 7 | -421/+1 |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-12-14 | GitLab Bot | 2017-12-14 | 191 | -1851/+3077 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'docs-add-indexes-monitoring' into 'master' | Achilleas Pipinellis | 2017-12-14 | 6 | -82/+96 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Docs: add indexes for monitoring and performance monitoring | Marcia Ramos | 2017-12-14 | 6 | -82/+96 |
| | |/ / / / / / / | |||||
| | * | | | | | | | Merge branch 'clearer-documentation-on-inline-diffs' into 'master' | Achilleas Pipinellis | 2017-12-14 | 2 | -3/+25 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | clearer-documentation-on-inline-diffs | Dimitrie Hoekstra | 2017-12-14 | 2 | -3/+25 |
| | |/ / / / / / / | |||||
| | * | | | | | | | Merge branch 'docs/commit-diff-discussions-in-mr-context' into 'master' | Achilleas Pipinellis | 2017-12-14 | 4 | -0/+47 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Add docs for commit diff discussion in merge requests | micael.bergeron | 2017-12-14 | 4 | -0/+47 |
| | * | | | | | | | | Merge branch 'rc/update-flipper' into 'master' | Robert Speicher | 2017-12-14 | 4 | -20/+32 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Update flipper to 0.11.0 and take advantage of the new featuresrc/update-flipper | Rémy Coutable | 2017-12-14 | 4 | -20/+32 |
| | * | | | | | | | | | Merge branch 'ph-es-modules' into 'master' | Filipa Lacerda | 2017-12-14 | 10 | -121/+67 |
| | |\ \ \ \ \ \ \ \ \ |