summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Skip projects filter on merge requests searchjprovazn-search-eeJan Provaznik2017-12-194-3/+29
* Merge branch 'ee-ph-es-notes-module' into 'master'Filipa Lacerda2017-12-188-24/+25
|\
| * Merge branch 'master' into 'ee-ph-es-notes-module'Phil Hughes2017-12-1813-370/+362
| |\
| * | EE port of ph-es-notes-modulePhil Hughes2017-12-188-24/+25
* | | Merge branch 'osw-isolate-mr-widget-exposed-attributes-ee' into 'master'Sean McGivern2017-12-1818-107/+72
|\ \ \
| * | | Stop sending milestone and labels data over the wire for MR widgetOswaldo Ferreira2017-12-1618-107/+72
* | | | Merge branch 'ee-41117-empty-state' into 'master'Phil Hughes2017-12-182-520/+545
|\ \ \ \
| * | | | ee - Only render signout screen when user is signed outFilipa Lacerda2017-12-182-520/+545
|/ / / /
* | | | Merge branch 'patch-5' into 'master'Marcia Ramos2017-12-181-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | With laravel's package auto-discovery, the composer install fails when it tri...Samuel2017-11-101-1/+1
* | | | Merge branch 'ee-ph-even-more-es-modules' into 'master'Filipa Lacerda2017-12-1813-370/+362
|\ \ \ \ | |_|_|/ |/| | |
| * | | EE port of ph-even-more-es-modulesPhil Hughes2017-12-1513-370/+362
* | | | Merge branch 'qa/gb/gitlab-qa-factories-ee' into 'master'Rémy Coutable2017-12-1822-240/+234
|\ \ \ \
| * | | | Rename QA scenarios to make factory concept explicit / EEGrzegorz Bizon2017-12-1822-240/+234
|/ / / /
* | | | Merge branch '41178-fix-weight-loading-spinner-in-boards' into 'master'Phil Hughes2017-12-181-1/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix loading spinner for the weight blockEric Eastwood2017-12-151-1/+0
* | | | Merge branch 'ee-38019-hide-runner-token' into 'master'Clement Ho2017-12-1610-49/+223
|\ \ \ \
| * | | | Hide runner token in CI/CD settings pageEric Eastwood2017-12-1510-49/+223
| |/ / /
* | | | Merge branch 'fix-wording-add-clusters' into 'master'Filipa Lacerda2017-12-152-2/+2
|\ \ \ \
| * \ \ \ Merge branch 'fix-wording-add-clusters' of gitlab.com:gitlab-org/gitlab-ee in...bikebilly2017-12-150-0/+0
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into fix-wording-add-clustersbikebilly2017-12-1538-521/+1139
| | |\ \ \ \
| | * | | | | Fix wording in Add Cluster tooltipbikebilly2017-12-152-2/+2
| * | | | | | Fix wording in Add Cluster tooltipbikebilly2017-12-152-2/+2
* | | | | | | Update CHANGELOG.md for 10.2.5Michael Kozono2017-12-1512-56/+20
* | | | | | | Update CHANGELOG-EE.md for 10.2.5-eeMichael Kozono2017-12-152-5/+7
* | | | | | | Merge branch 'ce-to-ee-2017-12-14' into 'master'Robert Speicher2017-12-15171-1845/+2526
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into ce-to-ee-2017-12-14Nick Thomas2017-12-15168-245/+267
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Fix some EE-only specsNick Thomas2017-12-151-2/+2
| * | | | | | | fixed popup_dialog.vue no longer existingPhil Hughes2017-12-152-11/+4
| * | | | | | | Merge remote-tracking branch 'ee/master' into ce-to-ee-2017-12-14Lin Jen-Shin2017-12-1544-665/+1993
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | resolve app/assets/stylesheets/framework/variables.scssPhil Hughes2017-12-151-3/+0
| * | | | | | | Resolve all_queues.yml and sidekiq_config.rbLin Jen-Shin2017-12-152-7/+0
| * | | | | | | Resolve conflicts in MR model specZeger-Jan van de Weg2017-12-151-9/+0
| * | | | | | | Resolve conflict in spec/models/ci/build_spec.rbRémy Coutable2017-12-151-3/+0
| * | | | | | | Resolve conflicts in member controllers, presenters, and viewsRémy Coutable2017-12-155-18/+1
| * | | | | | | Resolve conflict in app/assets/stylesheets/pages/boards.scssWinnie Hellmann2017-12-141-3/+0
| * | | | | | | [ci skip] Resolve clusters/index.html.haml conflictLuke Bennett2017-12-141-3/+0
| * | | | | | | [ci skip] Resolve gitlab-svgs assets conflictsLuke Bennett2017-12-142-10/+2
| * | | | | | | Resolve conflict for mr_titleClement Ho2017-12-141-4/+0
| * | | | | | | Fix conflicts for:Filipa Lacerda2017-12-147-421/+1
| * | | | | | | Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-12-14GitLab Bot2017-12-14191-1851/+3077
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'docs-add-indexes-monitoring' into 'master'Achilleas Pipinellis2017-12-146-82/+96
| | |\ \ \ \ \ \ \
| | | * | | | | | | Docs: add indexes for monitoring and performance monitoringMarcia Ramos2017-12-146-82/+96
| | |/ / / / / / /
| | * | | | | | | Merge branch 'clearer-documentation-on-inline-diffs' into 'master'Achilleas Pipinellis2017-12-142-3/+25
| | |\ \ \ \ \ \ \
| | | * | | | | | | clearer-documentation-on-inline-diffsDimitrie Hoekstra2017-12-142-3/+25
| | |/ / / / / / /
| | * | | | | | | Merge branch 'docs/commit-diff-discussions-in-mr-context' into 'master'Achilleas Pipinellis2017-12-144-0/+47
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add docs for commit diff discussion in merge requestsmicael.bergeron2017-12-144-0/+47
| | * | | | | | | | Merge branch 'rc/update-flipper' into 'master'Robert Speicher2017-12-144-20/+32
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Update flipper to 0.11.0 and take advantage of the new featuresrc/update-flipperRémy Coutable2017-12-144-20/+32
| | * | | | | | | | | Merge branch 'ph-es-modules' into 'master'Filipa Lacerda2017-12-1410-121/+67
| | |\ \ \ \ \ \ \ \ \