summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | include common libraries within spec_helperMike Greiling2017-01-101-1/+1
| * | | | | | | | | simplify and combine karma file patternsMike Greiling2017-01-101-10/+3
| * | | | | | | | | Swapped out teaspoon for karmaLuke "Jared" Bennett2017-01-102-2/+32
| * | | | | | | | | precompile webpack assets when testingMike Greiling2017-01-102-0/+4
| * | | | | | | | | disable "use strict" in babel config as it was broken in sprocketsMike Greiling2017-01-101-1/+7
| * | | | | | | | | migrate all javascript asset bundles and require syntaxMike Greiling2017-01-102-19/+22
| * | | | | | | | | replace application.js sprockets output with webpack-generated equivalentMike Greiling2017-01-061-2/+18
| * | | | | | | | | temporarily regress to babel 5 for parity with sprockets-es6 gemMike Greiling2017-01-061-4/+1
| * | | | | | | | | conditionally apply webpack-dev-server configMike Greiling2017-01-061-1/+4
| * | | | | | | | | optimize production output and generate sourcemapsMike Greiling2017-01-061-1/+15
| * | | | | | | | | compile es6/es2015 with babelMike Greiling2017-01-061-1/+18
| * | | | | | | | | add webpack, webpack-rails, and webpack-dev-server along with a simple hello ...Mike Greiling2017-01-062-0/+51
* | | | | | | | | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-034-2/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | PlantUML support for MarkdownHoracio Sanson2017-02-031-0/+2
| * | | | | | | | | Merge branch '20452-remove-require-from-request_profiler-initializer' into 'm...27537-flash-of-human-un-friendly-utc-timestampRobert Speicher2017-02-021-2/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Don't require lib/gitlab/request_profiler/middleware.rb in config/initializer...20452-remove-require-from-request_profiler-initializerRémy Coutable2017-02-021-2/+0
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Check public snippets for spamSean McGivern2017-02-022-0/+2
| |/ / / / / / /
* | | | | | | | Fix rubocop error from pages EE->CE portJames Edwards-Jones2017-02-021-1/+1
* | | | | | | | Fix 500 error while navigating to the `pages_domains` 'show' page.Timothy Andrew2017-01-311-1/+1
* | | | | | | | Final fixesKamil Trzcinski2017-01-311-2/+2
* | | | | | | | Split PagesController into PagesController and PagesDomainsControllerKamil Trzcinski2017-01-311-4/+2
* | | | | | | | Fix the remove_pagesKamil Trzcinski2017-01-311-1/+3
* | | | | | | | Implement extra domains and save pages configurationKamil Trzcinski2017-01-313-3/+6
* | | | | | | | Initial work on GitLab Pages updateKamil Trzcinski2017-01-312-1/+5
* | | | | | | | Fix pages path settings option.Kamil Trzcinski2017-01-311-1/+1
* | | | | | | | Fix pages storage pathKamil Trzcinski2017-01-311-1/+1
* | | | | | | | Re-add missing gitlab_on_standard_portKamil Trzcinski2017-01-311-2/+6
* | | | | | | | Change pages domain to hostKamil Trzcinski2017-01-312-2/+2
* | | | | | | | Support https and custom port for pagesKamil Trzcinski2017-01-312-9/+21
* | | | | | | | Fix specsKamil Trzcinski2017-01-311-0/+1
* | | | | | | | Add GitLab PagesKamil Trzcinski2017-01-313-0/+18
|/ / / / / / /
* | | | | | | Abillity to promote project labels to group labelsRitave2017-01-311-0/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | 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
|\ \ \ \ | |/ / / |/| | |