summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | Merge branch masterantonyliu2019-05-29290-8912/+4990
| | | |\ \ \ \ \
| | | * | | | | | Regenerate locale/gitlab.potantonyliu2019-05-281-3/+3
| | | * | | | | | Apply suggestion to app/views/profiles/two_factor_auths/show.html.hamlantony liu2019-05-281-1/+1
| | | * | | | | | Externalize strings of Two-Factor Authentication page in user profileantonyliu2019-05-258-48/+136
| | * | | | | | | Fix bug for picking up string that end with html_safeantonyliu2019-05-302-3/+9
| | * | | | | | | Apply suggestion to app/views/profiles/two_factor_auths/_codes.html.hamlantony liu2019-05-301-1/+2
| | * | | | | | | Regenerate locale/gitlab.potantonyliu2019-05-301-3/+3
| | * | | | | | | Apply suggestion to app/views/profiles/two_factor_auths/show.html.hamlantony liu2019-05-301-1/+1
| | * | | | | | | Externalize strings of Two-Factor Authentication page in user profileantonyliu2019-05-307-46/+131
| * | | | | | | | Regenerate locale/gitlab.potantonyliu2019-05-311-12/+0
| * | | | | | | | Externalize strings of Two-Factor Authentication page in user profileantonyliu2019-05-311-0/+12
| * | | | | | | | Fix bug for picking up string that end with html_safeantonyliu2019-05-312-3/+9
| * | | | | | | | Apply suggestion to app/views/profiles/two_factor_auths/_codes.html.hamlantony liu2019-05-311-1/+2
| * | | | | | | | Regenerate locale/gitlab.potantonyliu2019-05-311-3/+3
| * | | | | | | | Apply suggestion to app/views/profiles/two_factor_auths/show.html.hamlantony liu2019-05-311-1/+1
| * | | | | | | | Externalize strings of Two-Factor Authentication page in user profileantonyliu2019-05-317-46/+131
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'i18n-password-of-user-profile' into 'master'Bob Van Landuyt2019-05-314-20/+63
|\ \ \ \ \ \ \ \
| * | | | | | | | Make CE and EE consistentantonyliu2019-05-301-1/+1
| * | | | | | | | Fix method typing errorantonyliu2019-05-291-1/+1
| * | | | | | | | Merge remote-tracking branch 'origin/i18n-password-of-user-profile' into i18n...antonyliu2019-05-291-3/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Apply suggestion to app/views/profiles/passwords/edit.html.hamlantonyliu2019-05-292-6/+7
| | * | | | | | | | Merge branch masterantonyliu2019-05-29291-8914/+4995
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | Externalize strings of password page in user profileantonyliu2019-05-254-19/+61
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Apply suggestion to app/views/profiles/passwords/edit.html.hamlantonyliu2019-05-292-6/+7
| * | | | | | | | Externalize strings of password page in user profileantonyliu2019-05-293-16/+58
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'remove-render-if-exists-partial-caveat' into 'master'Phil Hughes2019-05-311-9/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove render_if_exists partial caveatremove-render-if-exists-partial-caveatLuke Bennett2019-05-311-9/+0
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'gt-open-visibility-help-link-in-a-new-tab' into 'master'Phil Hughes2019-05-312-1/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Open snippets visibility help link in a new tabGeorge Tsiolis2019-05-302-1/+6
* | | | | | | | Merge branch 'generate-letsencrypt-private_key-on-the-fly' into 'master'Stan Hu2019-05-315-30/+79
|\ \ \ \ \ \ \ \
| * | | | | | | | Generate lets_encrypt_private_key on the flyVladimir Shushlin2019-05-315-30/+79
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-qa-doc-consolidation' into 'master'Dan Davison2019-05-3110-27/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | Consolidate documentation written for e2e tests under dev docsddavison2019-05-3010-27/+38
* | | | | | | | | Merge branch 'faster_qa_auto_devops' into 'master'Dan Davison2019-05-311-0/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use Dockerfile flow for QA Auto DevOpsfaster_qa_auto_devopsThong Kuah2019-05-311-0/+9
* | | | | | | | | | Merge branch 'qa-fix-api-client-login-validation' into 'master'Dan Davison2019-05-311-6/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Allow login validation before blockqa-fix-api-client-login-validationMark Lapierre2019-05-311-6/+3
|/ / / / / / / / /
* | | | | | | | | Merge branch 'winh-issue-boards-addList-sort' into 'master'Mike Greiling2019-05-304-17/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Sort by position in issue boards store addList()Winnie Hellmann2019-05-304-17/+25
|/ / / / / / / / /
* | | | | | | | | Merge branch 'upgrade-core-js' into 'master'Mike Greiling2019-05-304-20/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Upgrade core-js and add URL polyfillupgrade-core-jsPaul Gascou-Vaillancourt2019-05-304-20/+26
* | | | | | | | | | Merge branch 'if-10137-ee_specific_lines_projects_api' into 'master'Robert Speicher2019-05-304-60/+90
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | CE port of Move EE specific lines in API::ProjectsImre Farkas2019-05-304-60/+90
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'if-10137-ee_specific_lines_settings_api' into 'master'Robert Speicher2019-05-303-47/+25
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | CE port of Move EE specific lines in API::SettingsImre Farkas2019-05-303-47/+25
|/ / / / / / / / /
* | | | | | | | | Merge branch '609120-ref-link' into 'master'Mayra Cabrera2019-05-303-1/+12
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Fixes ref being displayed as raw HTML609120-ref-linkFilipa Lacerda2019-05-303-1/+12
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'i18n-pgp_ssh_keys-of-user-profile' into 'master'12-0-stable-prepare-rc1Clement Ho2019-05-3012-36/+100
|\ \ \ \ \ \ \ \
| * | | | | | | | Externalize strings of PGP Keys and SSH Keys page in user profileantony liu2019-05-3012-36/+100
|/ / / / / / / /
* | | | | | | | Merge branch '47846-position-is-off-when-visiting-files-with-anchors' into 'm...Mike Greiling2019-05-302-0/+15
|\ \ \ \ \ \ \ \
View Lorry Controller Status