summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix Rubocop complains.Ruben Davila2017-05-022-22/+2
* Fixed context translationPhil Hughes2017-04-283-10/+9
* Add more spanish translations.Ruben Davila2017-04-279-15/+98
* Adjust regex used in order to parse inline content.Ruben Davila2017-04-278-6/+30
* Added some missing text that needs translatingPhil Hughes2017-04-279-12/+73
* Add more translation for Spanish.Ruben Davila2017-04-2616-22/+134
* Add some translations for Spanish.Ruben Davila2017-04-267-24/+145
* Adjust the patch for the gettext_i18n_rails and gettext_i18n_rails_js gems.Ruben Davila2017-04-261-24/+3
* Removed random test codePhil Hughes2017-04-261-2/+1
* Removed t filter from other placesPhil Hughes2017-04-2610-108/+120
* Changed JS translation functionsPhil Hughes2017-04-2619-114/+202
* Add ability to parse *.vue files through the `ruby gettext:find` scriptRuben Davila2017-04-252-0/+48
* 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-2412-19/+154
|\
| * Revert line being commented outjs-translationsPhil Hughes2017-04-211-12/+12
| * Merge remote-tracking branch 'origin/28433-internationalise-cycle-analytics-p...Phil Hughes2017-04-2115-22/+175
| |\
| | * 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-20365-4237/+7104
| |\ \
* | | | 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-203-4/+5
* | | Merge branch 'js-translations' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-04-2027-43/+214
|\ \ \ | |/ / | | / | |/ |/|
| * Created a plural filterPhil Hughes2017-04-194-3/+96
| * Fixed missing textPhil Hughes2017-04-182-3/+3
| * Default the language to en - more useful for specsPhil Hughes2017-04-182-1/+4
| * Make the locale file page specificPhil Hughes2017-04-182-2/+3
| * Added Vue filters & directives for translatingPhil Hughes2017-04-1815-36/+63
| * Started internationalising cycyle analyticsPhil Hughes2017-04-1512-5/+52
* | Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-04-19360-4229/+7091
|\ \
| * \ Merge branch 'dm-markup-helper-constants' into 'master' Robert Speicher2017-04-201-9/+16
| |\ \
| | * | Use constants in Gitlab::MarkupHelperDouwe Maan2017-04-201-9/+16
| |/ /
| * | Merge branch 'dm-fix-editing-files-on-forks' into 'master' Robert Speicher2017-04-2047-459/+274
| |\ \
| | * | Refactor changing files in web UIDouwe Maan2017-04-2047-459/+274
| |/ /
| * | Merge branch 'hook_retries' into 'master' Douwe Maan2017-04-192-0/+6
| |\ \
| | * | Add retry to system hook workerDrew Blessing2017-04-192-0/+6
| * | | Merge branch 'sh-issue-29247-fix' into 'master' Douwe Maan2017-04-194-0/+33
| |\ \ \
| | * | | Don't delete a branch involved in an open merge request in "Delete all merged...sh-issue-29247-fixStan Hu2017-04-194-0/+33
| * | | | Merge branch '30951-start-discussion-toggle-clicking-divider-causes-ui-break'...Alfredo Sumaran2017-04-197-6/+47
| |\ \ \ \
| | * | | | Resolve "start discussion toggle clicking divider causes UI break"Luke "Jared" Bennett2017-04-197-6/+47
| |/ / / /
| * | | | Merge branch 'sh-add-index-to-system-note-metadata' into 'master' Sean McGivern2017-04-193-1/+24
| |\ \ \ \
| | * | | | Add unique index for note_id to system note metadata tablesh-add-index-to-system-note-metadataStan Hu2017-04-193-1/+24
| | |/ / /
| * | | | Merge branch 'query-users-by-extern-uid' into 'master'Robert Speicher2017-04-195-8/+59
| |\ \ \ \
| | * | | | Implement search by extern_uid in Users APIRobin Bobbitt2017-04-185-8/+59
| * | | | | Merge branch '29977-style-comments-and-system-notes-real-time-updates' into '...Clement Ho2017-04-198-32/+196
| |\ \ \ \ \
| | * | | | | Add renderNote animation and added specLuke "Jared" Bennett2017-04-198-32/+196
| |/ / / / /
| * | | | | Merge branch 'right-sidebar-closed-default-mobile' into 'master' Alfredo Sumaran2017-04-194-0/+30
| |\ \ \ \ \
| | * | | | | Set the issuable sidebar to remain collapsed on mobile devicesJose Ivan Vargas Lopez2017-04-194-0/+30
| |/ / / / /
| * | | | | Merge branch 'branches-sort-toggle-empty' into 'master' Alfredo Sumaran2017-04-192-9/+15
| |\ \ \ \ \
| | * | | | | Fixed branches sort toggle being emptybranches-sort-toggle-emptyPhil Hughes2017-04-182-9/+15
| * | | | | | Merge branch 'fix-link-prometheus-opening-outside-gitlab' into 'master' Phil Hughes2017-04-192-1/+4
| |\ \ \ \ \ \