summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove "mergeCurrentUrlParams" function38919/wiki-empty-statesPaul Slaughter2018-05-233-58/+5
* Fix Ruby hash syntax in "empty_states/_wikis"Paul Slaughter2018-05-231-4/+4
* Move 'mergeCurrentUrlParams' into common_utilsPaul Slaughter2018-05-235-49/+57
* Generate fresh gitlab.potPaul Slaughter2018-05-231-8/+35
* Add changelog for wiki empty statesPaul Slaughter2018-05-231-0/+5
* Add test case for empty wiki viewPaul Slaughter2018-05-231-8/+33
* Add tests for url_utility/mergeCurrentUrlParamsPaul Slaughter2018-05-232-2/+41
* Cleanup files for empty wiki viewPaul Slaughter2018-05-236-47/+58
* Fix empty wiki with issue messagePaul Slaughter2018-05-231-2/+2
* Fix capitalization of wiki to be consistentPaul Slaughter2018-05-231-1/+1
* Refactor layout out of empty wiki shared viewPaul Slaughter2018-05-232-19/+30
* Fix regression wiki tests when visiting empty wikiPaul Slaughter2018-05-236-1/+16
* Add "view" param to wikis show actionPaul Slaughter2018-05-233-9/+10
* Add empty wikis viewPaul Slaughter2018-05-234-6/+73
* Add right_sidebar flag to nav_helperPaul Slaughter2018-05-231-0/+1
* Merge branch 'use-git-depth-1-on-cng-trigger' into 'master'Rémy Coutable2018-05-231-0/+2
|\
| * Set GIT_DEPTH to 1 to speed up cloning for the cloud images triggeruse-git-depth-1-on-cng-triggerDJ Mountney2018-05-221-0/+2
* | Merge branch 'issue-25256' into 'master'Douwe Maan2018-05-237-7/+72
|\ \
| * | skip email trim when email is creating new issueCameron Crockett2018-05-227-7/+72
* | | Merge branch 'gitaly-repo-squash-in-progress-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \
| * | | Make Repo#squash_in_progress Opt-Outgitaly-repo-squash-in-progress-opt-outKim Carlbäcker2018-05-221-1/+1
* | | | Merge branch 'gitaly-wiki-get-formatted-data-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \ \
| * | | | Move Wiki::GetFormattedData to OptOutgitaly-wiki-get-formatted-data-opt-outKim Carlbäcker2018-05-221-1/+1
* | | | | Merge branch 'gitaly-import-project-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \ \ \
| * | | | | Move ImportProject to OptOut in Gitalygitaly-import-project-opt-outKim Carlbäcker2018-05-221-1/+1
* | | | | | Merge branch 'gitaly-repo-info-attributes-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \ \ \ \
| * | | | | | Move Repository#info_attributes to OptOut in gitalygitaly-repo-info-attributes-opt-outKim Carlbäcker2018-05-221-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch '22846-notifications-broken-during-email-address-change-before-e...Douwe Maan2018-05-230-0/+0
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge branch '46354-deprecate_gemnasium_service' into 'master'Douwe Maan2018-05-238-26/+70
|\ \ \ \ \ \ \
| * | | | | | | Resolve "Deprecate Gemnasium project service"Olivier Gonzalez2018-05-238-26/+70
|/ / / / / / /
* | | | | | | Merge branch '45530-web-ide-doesn-t-work-for-branches-with-slashes' into 'mas...Douwe Maan2018-05-237-21/+40
|\ \ \ \ \ \ \
| * | | | | | | Resolve "Web IDE doesn't work for branches with slashes"Tim Zallmann2018-05-237-21/+40
|/ / / / / / /
* | | | | | | Merge branch 'ide-commit-state-bug' into 'master'Filipa Lacerda2018-05-232-2/+27
|\ \ \ \ \ \ \
| * | | | | | | fixed specPhil Hughes2018-05-231-0/+1
| * | | | | | | added specide-commit-state-bugPhil Hughes2018-05-221-0/+19
| * | | | | | | Fixed web IDE review & commit editors getting into incorrect statePhil Hughes2018-05-181-2/+7
* | | | | | | | Merge branch '46603-add-vue-loader-cache' into 'master'Fatih Acet2018-05-233-6/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | add file cache to vue-loader to speed up compilation46603-add-vue-loader-cacheMike Greiling2018-05-223-6/+29
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'ide-jobs-list' into 'master'Filipa Lacerda2018-05-2313-2/+679
|\ \ \ \ \ \ \ \
| * | | | | | | | group jobs into stageside-jobs-listPhil Hughes2018-05-229-27/+171
| * | | | | | | | added getter for checking is their is a pipelinePhil Hughes2018-05-226-8/+59
| * | | | | | | | Show CI jobs in web IDEPhil Hughes2018-05-2211-2/+484
* | | | | | | | | Merge branch 'ide-file-finder-improve-order' into 'master'Filipa Lacerda2018-05-233-7/+14
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | changed what bit of code stops the callbackide-file-finder-improve-orderPhil Hughes2018-05-222-4/+11
| * | | | | | | | Fixed IDE file finder orderingPhil Hughes2018-05-142-7/+7
* | | | | | | | | Merge branch '44895-explicit-merge-conflict' into 'master'Tim Zallmann2018-05-227-15/+52
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fix sentence for i18n44895-explicit-merge-conflictAnnabel Dunstone Gray2018-05-212-13/+23
| * | | | | | | | Add internationlization for conflict descriptionAnnabel Dunstone Gray2018-05-212-6/+15
| * | | | | | | | Update copy; add monospace font to branch namesAnnabel Dunstone Gray2018-05-212-5/+5
| * | | | | | | | Make source branch a linkAnnabel Dunstone Gray2018-05-211-1/+1
View Lorry Controller Status