summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* DRY with Gitlab.config.webpack.dev_server referenceswebpackMike Greiling2017-02-021-10/+12
* Merge branch 'master' into webpackMike Greiling2017-02-022-0/+2
|\
| * Check public snippets for spamSean McGivern2017-02-022-0/+2
* | disable webpack proxy in rspec environment due to conflicts with webmock gemMike Greiling2017-02-021-12/+20
* | configure webpack dev server port via environment variableMike Greiling2017-02-011-10/+2
* | add rack middleware to proxy webpack dev serverMike Greiling2017-02-014-0/+42
* | remove dev-server config from development environmentMike Greiling2017-01-311-7/+0
* | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-311-0/+1
|\ \ | |/
| * Abillity to promote project labels to group labelsRitave2017-01-311-0/+1
* | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-283-13/+15
|\ \ | |/
| * 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 'master' into go-go-gadget-webpackMike Greiling2017-01-276-113/+137
|\ \ | |/
| * 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
| | |/
* | | Use webpack_port file if it existsPhil Hughes2017-01-192-1/+12
* | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-182-0/+3
|\ \ \ | |/ /
| * | 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
* | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-151-1/+0
|\ \ \ \ | |/ / /
| * | | change how pagination component is loadedpipelines_missing_paginationRegis2017-01-151-1/+0
| | |/ | |/|
* | | add dependency license approvalsMike Greiling2017-01-141-10/+111
* | | more post-merge fixesMike Greiling2017-01-131-1/+1
* | | Added gzip compressionPhil Hughes2017-01-131-1/+5
* | | add phantomJS to karma configMike Greiling2017-01-131-0/+1
* | | Merge branch 'master' into go-go-gadget-webpackPhil Hughes2017-01-133-1/+9
|\ \ \ | |/ /
| * | 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
| |\ \ \ \ | | |/ / /
| * | | | fix pipelines/index.html.haml merge conflictRegis2017-01-022-3/+2
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | merge master and fix application.rb conflictRegis2016-12-234-5/+32
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-2111-7/+48
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2016-12-163-1/+10
| |\ \ \ \ \ \