summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix bug in webpack_helper in which force_same_domain argument was ignored bre...fix-local-rspec-testsMike Greiling2018-01-251-1/+1
* Merge branch 'tz-fix-ide-bugs' into 'master'Phil Hughes2018-01-1925-77/+169
|\
| * WebIDE: Fix Commit bugsTim Zallmann2018-01-1925-77/+169
|/
* Merge branch '42157-41989-fix-duplicate-in-create-item-dropdown' into 'master'Phil Hughes2018-01-194-1/+135
|\
| * Fix duplicate item in protected branch/tag dropdown42157-41989-fix-duplicate-in-create-item-dropdownEric Eastwood2018-01-184-1/+135
* | Merge branch 'fix-derefenced-target' into 'master'Douwe Maan2018-01-191-2/+2
|\ \
| * | Fix dereferenced_target naming in Gitlab::Git::Ref initializeSerdar Dogruyol2018-01-171-2/+2
* | | Merge branch 'fix-description-loss' into 'master'Phil Hughes2018-01-192-0/+51
|\ \ \
| * | | Fix eslintfix-description-lossJacob Schatz2018-01-181-4/+2
| * | | Remove Event listener and make code more readable.Jacob Schatz2018-01-181-4/+8
| * | | Add confirm when navigating away from page with tests.Jacob Schatz2018-01-182-0/+49
* | | | Merge branch '42159-utf8-uploads' into 'master'Douwe Maan2018-01-193-11/+17
|\ \ \ \
| * | | | Correctly escape UTF-8 path elements for uploadsNick Thomas2018-01-183-11/+17
* | | | | Merge branch '34055-issues-enabled-filter-misbehavior' into 'master'James Lopez2018-01-194-2/+35
|\ \ \ \ \
| * | | | | Resolve "Projects API: filter 'with_issues_enabled=true' returns projects wit...Jan Christophersen2018-01-194-2/+35
|/ / / / /
* | | | | Merge branch 'dispatcher-project-mr-edit' into 'master'Jacob Schatz2018-01-194-11/+34
|\ \ \ \ \
| * | | | | Refactor dispatcher project mr edit and creation diff pathClement Ho2018-01-184-11/+34
* | | | | | Merge branch 'dispatcher-groups' into 'master'Jacob Schatz2018-01-1817-75/+149
|\ \ \ \ \ \
| * | | | | | dynamic imports for groups: pagesSimon Knox2018-01-1817-75/+149
|/ / / / / /
* | | | | | Merge branch '42154-fix-artifact-size-calc' into 'master'Robert Speicher2018-01-183-1/+12
|\ \ \ \ \ \
| * | | | | | Fix a bug calculating artifact size for project statisticsNick Thomas2018-01-183-1/+12
* | | | | | | Merge branch '42187-update-gitlab-styles-to-2-3-0' into 'master'Robert Speicher2018-01-185-86/+75
|\ \ \ \ \ \ \
| * | | | | | | Update rubocop, rubocop-rspec, and gitlab-styles42187-update-gitlab-styles-to-2-3-0Rémy Coutable2018-01-185-86/+75
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '41247-timestamp' into 'master'Robert Speicher2018-01-185-24/+58
|\ \ \ \ \ \ \
| * | | | | | | Return last edited time instead of update time41247-timestampJan Provaznik2018-01-185-24/+58
* | | | | | | | Merge branch '42190-make-edit-labels-in-the-issuable-sidebar-consistent' into...Clement Ho2018-01-184-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Make the 'Edit' links consistent in the issuable sidebar42190-make-edit-labels-in-the-issuable-sidebar-consistentRémy Coutable2018-01-184-6/+6
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dispatcher-projects-mr-creation-new' into 'master'Jacob Schatz2018-01-182-14/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor dispatcher project mr creations new pathClement Ho2018-01-182-14/+21
|/ / / / / / / /
* | | | | | | | Merge branch 'tz-karma-libraries-upgrade' into 'master'Filipa Lacerda2018-01-183-234/+1259
|\ \ \ \ \ \ \ \
| * | | | | | | | Upgraded Karma DependenciesTim Zallmann2018-01-183-234/+1259
|/ / / / / / / /
* | | | | | | | Merge branch '42186-username-trailing-space' into 'master'Filipa Lacerda2018-01-181-3/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove trailing space after author name in note headerAnnabel Dunstone Gray2018-01-181-3/+1
* | | | | | | | | Merge branch 'rc/improve-mr-feature-specs' into 'master'Robert Speicher2018-01-1860-1748/+1087
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Improve MR feature specs and reduce duplicationrc/improve-mr-feature-specsRémy Coutable2018-01-1860-1748/+1087
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jramsay-3953-fast-ssh-ce-docs' into 'master'Marcia Ramos2018-01-181-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Add EE version and CE issue linkjramsay-3953-fast-ssh-ce-docsJames Ramsay2018-01-181-2/+3
| * | | | | | | | Add release added and release backported to CEJames Ramsay2018-01-181-0/+5
* | | | | | | | | Merge branch 'mk-delete-orphaned-routes-before-validation' into 'master'Stan Hu2018-01-183-0/+79
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Delete conflicting orphaned routesMichael Kozono2018-01-183-0/+79
|/ / / / / / / / /
* | | | | | | | | Merge branch 'background-migration-fix' into 'master'Douwe Maan2018-01-183-3/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Reduce UPDATEs for background column type changesbackground-migration-fixYorick Peterse2018-01-183-3/+6
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'docs/runners-clear-cache' into 'master'41938-create-merge-request-from-issue-page-styling-broken-and-source-dropdown-brokenMarcia Ramos2018-01-181-0/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Add cache clearing documentationAchilleas Pipinellis2018-01-181-0/+22
* | | | | | | | | Merge branch 'issue_37143_2' into 'master'Sean McGivern2018-01-185-2/+42
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Remove unnecessary query from labels filterFelipe Artur2018-01-185-2/+42
* | | | | | | | | Merge branch '41806-pipeline-jumping' into 'master'Annabel Dunstone Gray2018-01-183-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Increase pipeline mini graph width41806-pipeline-jumpingFilipa Lacerda2018-01-183-5/+5
* | | | | | | | | | Merge branch 'dispatcher-projects' into 'master'Filipa Lacerda2018-01-1821-55/+56
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | added project_new importdispatcher-projectsPhil Hughes2018-01-173-3/+3