summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bootstrap4Clement Ho2018-04-267-38/+153
|\
| * Reset milestone filter when clicking "Any Milestone" in dashboardWinnie Hellmann2018-04-261-13/+36
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceNick Thomas2018-04-2682-388/+670
| |\
| | * Merge branch 'ide-temp-file-folder-fixes' into 'master'Filipa Lacerda2018-04-264-18/+90
| | |\
| | | * Merge branch 'master' into ide-temp-file-folder-fixesPhil Hughes2018-04-25212-628/+2028
| | | |\
| | | * \ Merge branch 'master' into ide-temp-file-folder-fixesPhil Hughes2018-04-2326-112/+441
| | | |\ \
| | | * | | added line height to label in modalPhil Hughes2018-04-191-3/+3
| | | * | | fixed failing commit actions specPhil Hughes2018-04-191-1/+0
| | | * | | Merge branch 'master' into ide-temp-file-folder-fixesPhil Hughes2018-04-1943-316/+1289
| | | |\ \ \
| | | * | | | added spec to new file dropdownPhil Hughes2018-04-191-6/+16
| | | * | | | fixed modal_specPhil Hughes2018-04-181-11/+3
| | | * | | | Fixed bugs with IDE new directoryPhil Hughes2018-04-182-3/+68
| | * | | | | Merge branch 'performance/gb/improve-pipeline-creation-service' into 'master'Kamil Trzciński2018-04-261-7/+2
| | |\ \ \ \ \
| | | * | | | | Do not save associated records for pipeline builds twiceGrzegorz Bizon2018-04-251-7/+2
| | | | |_|_|/ | | | |/| | |
| * | | | | | Merge branch 'ide-relative-url-fix' of gitlab.com:gitlab-org/gitlab-ceNick Thomas2018-04-261-0/+25
| |\ \ \ \ \ \
| | * | | | | | fixed rubocopPhil Hughes2018-04-251-2/+2
| | * | | | | | restore original script_name configPhil Hughes2018-04-251-0/+11
| | * | | | | | added helper specPhil Hughes2018-04-251-0/+14
* | | | | | | | Merge branch 'bootstrap4' of gitlab.com:gitlab-org/gitlab-ce into bootstrap4Clement Ho2018-04-252-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | fix dropdown fixture, BS4 wants dropdown-menuSimon Knox2018-04-251-1/+3
| * | | | | | | | fix Settings spec -> use hidden class instead of hideSimon Knox2018-04-251-2/+0
* | | | | | | | | Merge branch 'master' into bootstrap4Clement Ho2018-04-25103-393/+1651
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'zj-storage-path-deprecation' into 'master'Douwe Maan2018-04-2523-110/+115
| |\ \ \ \ \ \ \
| | * | | | | | | Gitlab::Shell works on shard name, not pathZeger-Jan van de Weg2018-04-2523-110/+115
| * | | | | | | | Cleanup after adding MR diff's commit_count (try 2)Jan Provaznik2018-04-253-0/+32
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'fix-settings-preloading' into 'master'Rémy Coutable2018-04-251-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Do not preload settingsKamil Trzciński2018-04-241-1/+2
| * | | | | | | | Mock Pager in Karma testsWinnie Hellmann2018-04-243-51/+71
| * | | | | | | | Update import on actions file to fix conflict when rewire plugin was addedFilipa Lacerda2018-04-241-2/+2
| * | | | | | | | Merge branch 'matbaj/gitlab-ce-add-inherit-command' into 'master'Rémy Coutable2018-04-241-0/+76
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into matbaj/gitlab-ce-add-inherit-commandSean McGivern2018-04-24159-330/+860
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Make /copy_metadata only handle the first issuable passedSean McGivern2018-04-241-2/+13
| | * | | | | | | | | Merge branch 'master' into matbaj/gitlab-ce-add-inherit-commandSean McGivern2018-04-191051-22054/+48967
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixed typos and improved reference checkingMateusz Bajorski2018-03-031-12/+12
| | * | | | | | | | | | Changed command name to copy_metadata and added MR supportMateusz Bajorski2018-03-031-23/+23
| | * | | | | | | | | | Add Inherit quick actionMateusz Bajorski2018-03-031-0/+65
| * | | | | | | | | | | Merge branch 'bvl-fix-maintainer-push-error' into 'master'Douwe Maan2018-04-249-50/+133
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Allow admins to push to empty reposBob Van Landuyt2018-04-247-50/+79
| | * | | | | | | | | | Only show push-to-master authorized usersBob Van Landuyt2018-04-242-0/+54
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch '30998-add-babel-rewire-plugin' into 'master'Clement Ho2018-04-2439-133/+115
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | fix illegal references to "this" in module contextMike Greiling2018-04-2315-19/+19
| | * | | | | | | | | | convert remaining instances of import * to use spyOnDependencyMike Greiling2018-04-238-48/+35
| | * | | | | | | | | | fix more instances of "import *" with spyOnDependencyMike Greiling2018-04-2311-45/+32
| | * | | | | | | | | | fix tests in filtered_search_manager_spec.jsMike Greiling2018-04-231-8/+7
| | * | | | | | | | | | fix tests in droplab/hook_spec.jsMike Greiling2018-04-231-3/+2
| | * | | | | | | | | | fix tests in comment_type_toggle_spec.jsMike Greiling2018-04-231-3/+2
| | * | | | | | | | | | add spyOnDependency methodMike Greiling2018-04-234-7/+18
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge branch '43111-controller-projects-mergerequestscontroller-index-execute...Grzegorz Bizon2018-04-241-17/+33
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix an N+1 for MRs from forks on the MR index pageSean McGivern2018-04-241-17/+33
| * | | | | | | | | | | Show Runner's description on job's pageTomasz Maczukin2018-04-241-1/+1
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |