Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge branch '3867-port-to-ce' into 'master'" | Kamil Trzciński | 2018-02-28 | 74 | -914/+822 |
* | Merge branch '3867-port-to-ce' into 'master' | Sean McGivern | 2018-02-02 | 74 | -822/+914 |
|\ | |||||
| * | Merge branch 'master' into '3867-port-to-ce' | Sean McGivern | 2018-02-02 | 45 | -447/+942 |
| |\ | |/ |/| | |||||
* | | Merge branch '42223-squashing-mrs-takes-too-long' into 'master' | Sean McGivern | 2018-02-02 | 2 | -5/+43 |
|\ \ | |||||
| * | | Fix an issue where sparse checkout wasn't configured correctly42223-squashing-mrs-takes-too-long | Alejandro Rodríguez | 2018-02-01 | 2 | -5/+43 |
* | | | Merge branch 'fl-mr-widget-1' into 'master' | Phil Hughes | 2018-02-02 | 9 | -268/+418 |
|\ \ \ | |||||
| * | | | Fixes after reviewfl-mr-widget-1 | Filipa Lacerda | 2018-02-01 | 2 | -12/+18 |
| * | | | Merge branch 'master' into fl-mr-widget-1 | Filipa Lacerda | 2018-02-01 | 181 | -835/+1830 |
| |\ \ \ | |||||
| * | | | | Transform `a` tag with button role into a `button` | Filipa Lacerda | 2018-02-01 | 2 | -9/+11 |
| * | | | | Update spec to match link being changed into a button | Filipa Lacerda | 2018-02-01 | 1 | -1/+1 |
| * | | | | Moves widget header into a vue file | Filipa Lacerda | 2018-02-01 | 6 | -212/+351 |
| * | | | | Moves merge help into a vue component | Filipa Lacerda | 2018-01-31 | 5 | -60/+63 |
* | | | | | Merge branch 'fl-mr-widget-2' into 'master' | Phil Hughes | 2018-02-02 | 9 | -137/+136 |
|\ \ \ \ \ | |||||
| * | | | | | Moves more mr widget components into vue filesfl-mr-widget-2 | Filipa Lacerda | 2018-02-01 | 9 | -137/+136 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'patch-28' into 'master' | Dmitriy Zaporozhets | 2018-02-02 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix typo in gitlab_runner_chart.md | Alexandre Figura | 2018-02-01 | 1 | -2/+2 |
* | | | | | | Merge branch 'issues-closed-at-steal' into 'master' | Sean McGivern | 2018-02-02 | 3 | -1/+48 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Finish any remaining jobs for issues.closed_atissues-closed-at-steal | Yorick Peterse | 2018-02-01 | 3 | -1/+48 |
* | | | | | | | Merge branch 'fix/improve-issue-note-dropdown' into 'master' | Phil Hughes | 2018-02-02 | 3 | -3/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Improve issue mr and branch dropdown button | George Tsiolis | 2018-01-29 | 3 | -3/+7 |
* | | | | | | | | Merge branch 'qa-173' into 'master' | Grzegorz Bizon | 2018-02-01 | 2 | -1/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | QA::Page::Component::Dropzone#initialize needs a QA::Page::Base objectqa-173 | Rémy Coutable | 2018-02-01 | 2 | -1/+3 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'qa-absolute-path-to-screenshots' into 'master' | Grzegorz Bizon | 2018-02-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Ensure we save QA screenshots to an absolute pathqa-absolute-path-to-screenshots | Rémy Coutable | 2018-02-01 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'backport-ee-4644-geo-selective-sync-by-shard' into 'master' | Robert Speicher | 2018-02-01 | 2 | -3/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Refactor repository_storages_options_for_select | Nick Thomas | 2018-01-31 | 2 | -3/+4 |
* | | | | | | | | | Merge branch 'add-confirmation-input-for-modals' into 'master' | Clement Ho | 2018-02-01 | 3 | -0/+130 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | Add confirmation input component | Jose Ivan Vargas | 2018-02-01 | 3 | -0/+130 |
* | | | | | | | | | Merge branch 'docs-rename-products-new-policy' into 'master' | 🚄 Job van der Voort 🚀 | 2018-02-01 | 1 | -22/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Docs: update GitLab products description | Marcia Ramos | 2018-02-01 | 1 | -22/+6 |
* | | | | | | | | | | Merge branch 'gitaly-970-repo-write-config' into 'master' | Robert Speicher | 2018-02-01 | 5 | -2/+66 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Migrate Gitlab::Git::Repository#write_config to Gitalygitaly-970-repo-write-config | Kim "BKC" Carlbäcker | 2018-01-31 | 5 | -2/+66 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch '35285-user-interface-bugs-for-schedule-pipelines' into 'master' | Rémy Coutable | 2018-02-01 | 5 | -1/+76 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Hide pipeline schedule 'take ownership' for current owner | Mark Fletcher | 2018-02-01 | 5 | -1/+76 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rc/speedup-gitlab_git_test' into 'master' | Robert Speicher | 2018-02-01 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Speed-up the gitlab_git_test job | Rémy Coutable | 2018-02-01 | 1 | -1/+2 |
|/ / / / / / / / | |||||
| | | | | | | * | porting changes from upstream3867-port-to-ce | Micaël Bergeron | 2018-02-01 | 5 | -17/+5 |
| | | | | | | * | porting upstream changes | Micaël Bergeron | 2018-02-01 | 1 | -2/+2 |
| | | | | | | * | fix the migration from not reverting correctly | Micaël Bergeron | 2018-02-01 | 1 | -2/+2 |
| | | | | | | * | fix the schema.rb | Micaël Bergeron | 2018-02-01 | 1 | -3/+1 |
| | | | | | | * | fix specs | Micaël Bergeron | 2018-02-01 | 5 | -10/+7 |
| | | | | | | * | port of 594e6a0a625^..f74c90f68c6 | Micaël Bergeron | 2018-02-01 | 70 | -801/+910 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge branch 'ph-axios-3' into 'master' | Filipa Lacerda | 2018-02-01 | 9 | -151/+207 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | fixed infinite loop crashing testsph-axios-3 | Phil Hughes | 2018-02-01 | 1 | -8/+13 |
| * | | | | | | Converted todos.js to axios | Phil Hughes | 2018-02-01 | 1 | -22/+15 |
| * | | | | | | Converted usage_ping.js to use axios | Phil Hughes | 2018-02-01 | 1 | -9/+10 |
| * | | | | | | Converted pager.js to axios | Phil Hughes | 2018-02-01 | 2 | -32/+77 |
| * | | | | | | Converted notifications_form.js to axios | Phil Hughes | 2018-02-01 | 1 | -19/+19 |
| * | | | | | | Converted notes.js to axios | Phil Hughes | 2018-02-01 | 1 | -20/+15 |
| * | | | | | | Converted branch_graph.js to axios | Phil Hughes | 2018-02-01 | 1 | -8/+8 |