summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ...Valery Sizov2017-05-0510-0/+522
|\
| * Merge branch 'mrchrisw-import-shell-timeout'Sean McGivern2017-05-052-0/+4
| |\
| | * Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeoutChris Wilson2017-04-272-0/+4
| * | Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-05-044-1/+25
| |\ \
| | * \ Merge branch 'deploy-keys-load-async' into 'master' Filipa Lacerda2017-05-041-0/+2
| | |\ \
| | | * | Updated webpack configPhil Hughes2017-05-041-0/+1
| | | * | Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-042-0/+12
| | | |\ \
| | | * \ \ Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-038-16/+38
| | | |\ \ \
| | | * | | | Re-wrote to match our docs - still not 100% sure but closer than it wasPhil Hughes2017-04-281-0/+1
| | * | | | | Merge branch 'dm-artifact-blob-viewer' into 'master' Sean McGivern2017-05-041-0/+1
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewerDouwe Maan2017-05-041-0/+1
| | | | |/ / | | | |/| |
| | * | | | Merge branch '12910-uploader-pers-snippet' into 'master' Sean McGivern2017-05-041-0/+11
| | |\ \ \ \
| | | * | | | Support uploaders for personal snippets comments12910-uploader-pers-snippetJarka Kadlecova2017-05-021-0/+11
| * | | | | | Add CHANGELOG entry, some specs and locale file for German.Ruben Davila2017-05-041-0/+219
| * | | | | | More updates for translations plus small tweaks.Ruben Davila2017-05-041-0/+217
| * | | | | | Disable FastGettext from translating AR attrs.Ruben Davila2017-05-041-0/+3
| * | | | | | 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
| |\ \ \ \ \ \
| * | | | | | | 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
| | * | | | | | | Added Vue filters & directives for translatingPhil Hughes2017-04-181-0/+8
| | * | | | | | | Started internationalising cycyle analyticsPhil Hughes2017-04-151-0/+5
| * | | | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-04-197-117/+112
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix Rubocop complains plus some small refactorRuben Davila2017-04-191-1/+1
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Add missing initializer for FastGettextRuben Davila2017-04-121-0/+3
* | | | | | | | | Fix webpack config conflictClement Ho2017-05-041-5/+0
* | | | | | | | | Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-041-1/+6
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Allow to create new branch and empty WIP merge request from issue pageAlfredo Sumaran2017-05-041-0/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'async-milestone-tabs' into 'master' Jacob Schatz2017-05-032-1/+10
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Load milestone tabs asynchronouslyPhil Hughes2017-04-262-1/+10
* | | | | | | 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
| | |_|/ / / / / | |/| | | | | |