summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '27280-fix-unititalized-constant' into 'master' Robert Speicher2017-01-272-13/+1
|\
| * Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/27280-fix-unititalized-constantRémy Coutable2017-01-271-6/+0
| * Move a begin/rescue clause to ApplicationSetting.expireRémy Coutable2017-01-271-7/+1
* | Add the rspec_profiling gem and documentation to the GitLab development envir...23034-enable-rspec-profilingNick Thomas2017-01-271-0/+14
|/
* Merge branch 'mysql-sources-utf8mb4-fix' into 'master'Rémy Coutable2017-01-261-4/+4
|\
| * Gitlab from sources : proper utf8mb4 support for MySQL 5.5 to 5.7Guillaume Simon2017-01-121-4/+4
* | Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan2017-01-251-0/+9
|\ \
| * | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-251-0/+9
* | | Merge branch 'dz-fix-group-canonical-route' into 'master' Dmitriy Zaporozhets2017-01-251-4/+2
|\ \ \
| * | | Fix 500 error for Group#web_url method if nested groupdz-fix-group-canonical-routeDmitriy Zaporozhets2017-01-241-4/+2
| |/ /
* | | Add metric initializer specadd-metrics-initializer-specSean McGivern2017-01-241-104/+115
|/ /
* | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable2017-01-201-1/+1
|\ \
| * | Moved the webhooks and services gear options to a single one called integrationsJose Ivan Vargas2017-01-181-1/+1
* | | Merge branch 'feature/gitaly-feature-flag' into 'master' Robert Speicher2017-01-191-0/+6
|\ \ \ | |/ / |/| |
| * | Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledfeature/gitaly-feature-flagAhmad Sherif2017-01-181-0/+6
| |/
* | Merge branch 'backport-time-tracking-ce' into 'master' Douwe Maan2017-01-181-0/+2
|\ \
| * | Backport timetracking frontend to CE.Bryce Johnson2017-01-151-0/+2
* | | Merge branch '24915_merge_slash_command' into 'master' Sean McGivern2017-01-171-0/+1
|\ \ \ | |/ / |/| |
| * | refresh merge widget after using /merge commandJarka Kadlecova2017-01-111-0/+1
* | | change how pagination component is loadedpipelines_missing_paginationRegis2017-01-151-1/+0
| |/ |/|
* | Add basic searchClement Ho2017-01-091-0/+1
|/
* Merge branch 'master' into auto-pipelines-vueRegis2017-01-092-0/+5
|\
| * Merge branch 'track_last_used_date_of_ssh_keys' into 'master' Sean McGivern2017-01-091-0/+1
| |\
| | * Record and show last used date of SSH KeysVincent Wong2017-01-091-0/+1
| * | Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' Alfredo Sumaran2017-01-061-0/+4
| |\ \
| | * | Moved the members (project_members)option to a single controller called membersJose Ivan Vargas2017-01-031-0/+4
* | | | Merge branch 'master' into auto-pipelines-vueFilipa Lacerda2017-01-051-0/+6
|\ \ \ \ | |/ / /
| * | | Merge branch 'monkey-patch-comment' into 'master' Rémy Coutable2017-01-051-0/+6
| |\ \ \ | | |/ / | |/| |
| | * | Explain why there is a monkey-patchJacob Vosmaer2016-12-271-0/+6
| | |/
* | | fix pipelines/index.html.haml merge conflictRegis2017-01-022-3/+2
|\ \ \ | |/ /
| * | Merged the 'groups' and 'projects' tabs when viewing user profilesJames Gregory2016-12-291-1/+0
| * | Fix 500 error when visit group from admin area if group name contains dotdz-improve-admin-group-routingDmitriy Zaporozhets2016-12-281-1/+1
| |/
| * Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern2016-12-261-1/+1
| |\
| | * Add more storage statisticsMarkus Koller2016-12-211-1/+1
* | | merge master and fix application.rb conflictRegis2016-12-234-5/+32
|\ \ \ | |/ /
| * | Merge branch 'permit-uploadedfile-scalar' into 'master' Rémy Coutable2016-12-231-0/+16
| |\ \
| | * | Monkey-patch StrongParameters for ::UploadedFileJacob Vosmaer2016-12-231-0/+16
| * | | Merge branch '25896-fix-404-katax-fonts' into 'master' Alfredo Sumaran2016-12-221-0/+2
| |\ \ \
| | * | | Add KaTeX fonts to assets paths and precompileHiroyuki Sato2016-12-221-0/+2
| * | | | Merge branch '23638-remove-builds-tab' into 'master' Kamil Trzciński2016-12-211-4/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Changes after reviewFilipa Lacerda2016-12-211-2/+0
| | * | | Remove builds tab from commitFilipa Lacerda2016-12-211-1/+0
| | * | | Removes builds tab from merge requestFilipa Lacerda2016-12-211-1/+0
| * | | | Merge branch 'backport-mr-widget-ci-js' into 'master' Alfredo Sumaran2016-12-211-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Remove unneeded bundle refs.backport-mr-widget-ci-jsBryce Johnson2016-12-211-2/+0
| | * | | Backport moving MR widget CI JS out of script tag.Bryce Johnson2016-12-211-0/+3
| * | | | Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-212-1/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-205-1/+12
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Improve sourcesKamil Trzcinski2016-12-191-1/+1
| | * | | Minor adjustments API MattermostZ.J. van de Weg2016-12-191-5/+1
View Lorry Controller Status