summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* apply fixes from feedback42547-upload-store-mount-pointMicaël Bergeron2018-02-023-9/+37
* fix the schema.rbMicaël Bergeron2018-02-021-0/+2
* fix specsMicaël Bergeron2018-02-022-1/+6
* add the uploader context to the upload modelMicaël Bergeron2018-02-0212-30/+85
* Merge branch '3867-port-to-ce' into 'master'Sean McGivern2018-02-0274-822/+914
|\
| * Merge branch 'master' into '3867-port-to-ce'Sean McGivern2018-02-0245-447/+942
| |\ | |/ |/|
* | Merge branch '42223-squashing-mrs-takes-too-long' into 'master'Sean McGivern2018-02-022-5/+43
|\ \
| * | Fix an issue where sparse checkout wasn't configured correctly42223-squashing-mrs-takes-too-longAlejandro Rodríguez2018-02-012-5/+43
* | | Merge branch 'fl-mr-widget-1' into 'master'Phil Hughes2018-02-029-268/+418
|\ \ \
| * | | Fixes after reviewfl-mr-widget-1Filipa Lacerda2018-02-012-12/+18
| * | | Merge branch 'master' into fl-mr-widget-1Filipa Lacerda2018-02-01181-835/+1830
| |\ \ \
| * | | | Transform `a` tag with button role into a `button`Filipa Lacerda2018-02-012-9/+11
| * | | | Update spec to match link being changed into a buttonFilipa Lacerda2018-02-011-1/+1
| * | | | Moves widget header into a vue fileFilipa Lacerda2018-02-016-212/+351
| * | | | Moves merge help into a vue componentFilipa Lacerda2018-01-315-60/+63
* | | | | Merge branch 'fl-mr-widget-2' into 'master'Phil Hughes2018-02-029-137/+136
|\ \ \ \ \
| * | | | | Moves more mr widget components into vue filesfl-mr-widget-2Filipa Lacerda2018-02-019-137/+136
| | |/ / / | |/| | |
* | | | | Merge branch 'patch-28' into 'master'Dmitriy Zaporozhets2018-02-021-2/+2
|\ \ \ \ \
| * | | | | Fix typo in gitlab_runner_chart.mdAlexandre Figura2018-02-011-2/+2
* | | | | | Merge branch 'issues-closed-at-steal' into 'master'Sean McGivern2018-02-023-1/+48
|\ \ \ \ \ \
| * | | | | | Finish any remaining jobs for issues.closed_atissues-closed-at-stealYorick Peterse2018-02-013-1/+48
* | | | | | | Merge branch 'fix/improve-issue-note-dropdown' into 'master'Phil Hughes2018-02-023-3/+7
|\ \ \ \ \ \ \
| * | | | | | | Improve issue mr and branch dropdown buttonGeorge Tsiolis2018-01-293-3/+7
* | | | | | | | Merge branch 'qa-173' into 'master'Grzegorz Bizon2018-02-012-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | QA::Page::Component::Dropzone#initialize needs a QA::Page::Base objectqa-173Rémy Coutable2018-02-012-1/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'qa-absolute-path-to-screenshots' into 'master'Grzegorz Bizon2018-02-011-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Ensure we save QA screenshots to an absolute pathqa-absolute-path-to-screenshotsRémy Coutable2018-02-011-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'backport-ee-4644-geo-selective-sync-by-shard' into 'master'Robert Speicher2018-02-012-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor repository_storages_options_for_selectNick Thomas2018-01-312-3/+4
* | | | | | | | | Merge branch 'add-confirmation-input-for-modals' into 'master'Clement Ho2018-02-013-0/+130
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Add confirmation input componentJose Ivan Vargas2018-02-013-0/+130
* | | | | | | | | Merge branch 'docs-rename-products-new-policy' into 'master'🚄 Job van der Voort 🚀2018-02-011-22/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Docs: update GitLab products descriptionMarcia Ramos2018-02-011-22/+6
* | | | | | | | | | Merge branch 'gitaly-970-repo-write-config' into 'master'Robert Speicher2018-02-015-2/+66
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Migrate Gitlab::Git::Repository#write_config to Gitalygitaly-970-repo-write-configKim "BKC" Carlbäcker2018-01-315-2/+66
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '35285-user-interface-bugs-for-schedule-pipelines' into 'master'Rémy Coutable2018-02-015-1/+76
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Hide pipeline schedule 'take ownership' for current ownerMark Fletcher2018-02-015-1/+76
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rc/speedup-gitlab_git_test' into 'master'Robert Speicher2018-02-011-1/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Speed-up the gitlab_git_test jobRémy Coutable2018-02-011-1/+2
|/ / / / / / / /
| | | | | | | * porting changes from upstream3867-port-to-ceMicaël Bergeron2018-02-015-17/+5
| | | | | | | * porting upstream changesMicaël Bergeron2018-02-011-2/+2
| | | | | | | * fix the migration from not reverting correctlyMicaël Bergeron2018-02-011-2/+2
| | | | | | | * fix the schema.rbMicaël Bergeron2018-02-011-3/+1
| | | | | | | * fix specsMicaël Bergeron2018-02-015-10/+7
| | | | | | | * port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-0170-801/+910
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'ph-axios-3' into 'master'Filipa Lacerda2018-02-019-151/+207
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | fixed infinite loop crashing testsph-axios-3Phil Hughes2018-02-011-8/+13
| * | | | | | Converted todos.js to axiosPhil Hughes2018-02-011-22/+15
| * | | | | | Converted usage_ping.js to use axiosPhil Hughes2018-02-011-9/+10
| * | | | | | Converted pager.js to axiosPhil Hughes2018-02-012-32/+77