summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* First round of updates from the code review.Ruben Davila2017-05-021-1/+3
* Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-05-0214-18/+51
|\
| * Merge branch 'remove-unused-initializer' into 'master' Douwe Maan2017-05-021-5/+0
| |\
| | * Remove unused initializerremove-unused-initializerSean McGivern2017-05-021-5/+0
| * | Merge branch 'metrics-deployment-history' into 'master' Douwe Maan2017-05-021-0/+2
| |\ \
| | * \ Merge remote-tracking branch 'upstream/master' into 26914-add_deploy_history_...Pawel Chojnacki2017-04-2015-149/+286
| | |\ \
| | * | | Add endpoint that returns a list of deployments that happened within last 8.h...Pawel Chojnacki2017-03-281-0/+2
| * | | | Merge branch 'dm-snippet-download-button' into 'master' Sean McGivern2017-05-022-3/+2
| |\ \ \ \
| | * | | | Add download button to project snippetsdm-snippet-download-buttonDouwe Maan2017-04-302-3/+2
| | | |_|/ | | |/| |
| * | | | Merge branch '12910-personal-snippets-notes-show' into 'master' Sean McGivern2017-05-021-0/+8
| |\ \ \ \
| | * | | | Display comments for personal snippets12910-personal-snippets-notes-showJarka Kadlecova2017-05-021-0/+8
| * | | | | Merge branch '19364-webhook-edit' into 'master' Dmitriy Zaporozhets2017-05-022-3/+5
| |\ \ \ \ \
| | * | | | | Implement ability to update hooksAlexander Randa2017-04-282-3/+5
| * | | | | | Merge branch 'pdflab-in-repo' into 'master' Phil Hughes2017-05-021-0/+5
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Move PDFLab into GitLabpdflab-in-repoSam Rose2017-04-281-0/+5
| * | | | | | Update Carrierwave and fog-coreZeger-Jan van de Weg2017-05-011-0/+2
| | |_|/ / / | |/| | | |
| * | | | | Resolve "rspec_profiling is enabled for MySQL"Rémy Coutable2017-04-281-4/+4
| * | | | | Merge branch 'grpc-fork-tests' into 'master' 24339-job-page-step-2Sean McGivern2017-04-282-0/+4
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add test that asserts unicorns terminateJacob Vosmaer2017-04-262-0/+4
| * | | | | Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb"Dosuken shinya2017-04-281-1/+1
| * | | | | Merge branch '12910-personal-snippet-prep-2' into 'master' Sean McGivern2017-04-261-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Support preview_markdown action for personal_snippetsJarka Kadlecova2017-04-261-0/+1
| | |/ / /
| * | | | Merge branch 'test-pg' into 'master' Rémy Coutable2017-04-243-2/+7
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-121-2/+2
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-122-4/+68
| | |\ \ \ \ \
| | * | | | | | Add # host for development and test as wellLin Jen-Shin2017-04-111-0/+2
| | * | | | | | Set profiler only for postgresql not mysqlLin Jen-Shin2017-04-101-1/+1
| | * | | | | | Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-103-0/+10
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-0710-33/+99
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-03-293-3/+11
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-03-272-1/+3
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Test both PostgreSQL and MySQL for the win.Lin Jen-Shin2017-03-241-1/+4
| * | | | | | | | | | | Merge branch 'workhorse-secret-path' into 'master' Rémy Coutable2017-04-242-0/+11
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Make location of gitlab_workhorse_secret configurableJakub Jirutka2017-04-192-0/+11
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Remove the ClearDatabaseCacheWorkerNick Thomas2017-04-211-1/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Fix Rubocop complains.Ruben Davila2017-05-021-1/+0
* | | | | | | | | | | Adjust regex used in order to parse inline content.Ruben Davila2017-04-271-2/+2
* | | | | | | | | | | Adjust the patch for the gettext_i18n_rails and gettext_i18n_rails_js gems.Ruben Davila2017-04-261-24/+3
* | | | | | | | | | | Add ability to parse *.vue files through the `ruby gettext:find` scriptRuben Davila2017-04-251-0/+15
* | | | | | | | | | | Parse translate filters from JS files.Ruben Davila2017-04-251-2/+29
* | | | | | | | | | | Parse the translate-plural filter in HAML viewsRuben Davila2017-04-241-0/+4
* | | | | | | | | | | Merge branch 'js-translations' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-04-242-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert line being commented outjs-translationsPhil Hughes2017-04-211-12/+12
| * | | | | | | | | | | Merge remote-tracking branch 'origin/28433-internationalise-cycle-analytics-p...Phil Hughes2017-04-213-1/+18
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Monkey patch gettext_i18n_rails so it can parse content in Mustache formatRuben Davila2017-04-201-0/+17
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/28433-internationalise-cycle-analytics-p...Phil Hughes2017-04-208-118/+113
| |\ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | Monkey patch gettext_i18n_rails so it can parse content in Mustache formatRuben Davila2017-04-241-0/+19
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Some small fixes for the current I18n implementationRuben Davila2017-04-201-1/+1
* | | | | | | | | | | | | Merge branch 'js-translations' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-04-201-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | / / / / / / / / / / / | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed missing textPhil Hughes2017-04-181-1/+1