summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make sure reCAPTCHA configuration is loaded when spam checks are initiatedsh-recaptcha-fix-try2Stan Hu2017-06-103-1/+14
| | | | | | | Previously it was possible when an issue was updated and Akismet flagged it as spam that the reCAPTCHA configuration was not loaded. Closes #33532
* Merge branch 'sh-bump-oauth2-gem' into 'master'Robert Speicher2017-06-093-7/+11
|\ | | | | | | | | | | | | Bump Faraday and dependent OAuth2 gem version to support no_proxy variable Closes omnibus-gitlab#1714 See merge request !12074
| * Bump Faraday and dependent OAuth2 gem version to support no_proxy variableStan Hu2017-06-093-7/+11
| | | | | | | | Closes gitlab-org/omnibus-gitlab#1714
* | Merge branch '33208-singup-active-state-underline' into 'master'Clement Ho2017-06-092-0/+6
|\ \ | | | | | | | | | | | | | | | | | | Fixes sign up active state underline misalignment Closes #33208 See merge request !11890
| * | Fixes sign up active state underline misalignmentFrank Sierra2017-06-092-0/+6
|/ /
* | Merge branch 'bugfix/upgrade-ruby-parser' into 'master'Douwe Maan2017-06-092-4/+4
|\ \ | |/ |/| | | | | Bugfix/upgrade ruby parser See merge request !11861
| * ruby 2.4 support: upgrade ruby_parser to 3.9bugfix/upgrade-ruby-parserhttp://jneen.net/2017-06-092-4/+4
| |
* | Merge branch '33469-focus' into 'master'Annabel Dunstone Gray2017-06-092-1/+5
|\ \ | | | | | | | | | | | | | | | | | | remove outline from More Actions icon when dropdown open Closes #33469 See merge request !12054
| * | remove outline from dropdown toggles when dropdown open33469-focusSimon Knox2017-06-102-1/+5
| | |
* | | Merge branch 'dm-mail-room-check-without-omnibus' into 'master'Robert Speicher2017-06-092-5/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't check if MailRoom is running on Omnibus Closes #19607 See merge request !12056
| * | | Don't check if MailRoom is running on Omnibusdm-mail-room-check-without-omnibusDouwe Maan2017-06-092-5/+8
| | | |
* | | | Merge branch 'cache-diff-size-limits' into 'master'Douwe Maan2017-06-091-2/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Only look up diff size limit flags once per request See merge request !12048
| * | | | Only look up diff size limit flags once per requestcache-diff-size-limitsSean McGivern2017-06-091-2/+18
| | | | |
* | | | | Merge branch 'bvl-revert-regenerating-translations' into 'master'Douwe Maan2017-06-0914-3109/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Regenerate po and js files" See merge request !12044
| * | | | | Recover last working spanish translationbvl-revert-regenerating-translationsBob Van Landuyt2017-06-092-69/+591
| | | | | |
| * | | | | Mention the cause of missing translations in the docsBob Van Landuyt2017-06-091-0/+8
| | | | | |
| * | | | | Revert "Regenerate po and js files"Bob Van Landuyt2017-06-0913-3109/+8
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9157c300b78314e04857c66dacdc732a8193d278.
* | | | | | Merge branch 'dm-revert-mr-8427'Douwe Maan2017-06-0928-720/+24
|\ \ \ \ \ \
| * | | | | | Revert 'New file from interface on existing branch'dm-revert-mr-8427Douwe Maan2017-06-0928-720/+24
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '32622-fix-markdown_preview_spec' into 'master'Robert Speicher2017-06-091-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure wiki is created before we visit the Wiki page Closes #32622 See merge request !12059
| * | | | | | Ensure wiki is created before we visit the Wiki page32622-fix-markdown_preview_specRémy Coutable2017-06-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :facepalm: Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch ↵Rémy Coutable2017-06-091-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33457-features-project-source-markdown_render-feature-fails-on-master' into 'master' Fix intermittent Spinach markdown render failure Closes #33457 See merge request !12053
| * | | | | | | Fix intermittent Spinach markdown render failure33457-features-project-source-markdown_render-feature-fails-on-masterSean McGivern2017-06-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When loading a tree with a README.md, we need to wait for the blob viewer.
* | | | | | | | Merge branch 'tc-link-to-commit-on-help-page' into 'master'Robert Speicher2017-06-094-3/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the revision on the `/help` page clickable See merge request !12016
| * | | | | | | | Make the revision on the `/help` page clickabletc-link-to-commit-on-help-pageToon Claes2017-06-094-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For quicker access, add hyperlink to the gitlab.com commits page for the current REVISION of GitLab.
* | | | | | | | | Merge branch 'dturner/grammar' into 'master'Rémy Coutable2017-06-091-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the grammar of the API docs See merge request !11863
| * | | | | | | | | Improve the grammar of the API docsDavid Turner2017-06-011-4/+4
| | | | | | | | | |
* | | | | | | | | | Merge branch 'patch-17' into 'master'Rémy Coutable2017-06-091-2/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix syntax error that breaks link to permissions document. See merge request !11968
| * | | | | | | | | | Fix syntax error that breaks link to permissions document.Sascha Reynolds2017-06-091-2/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'clarify-transferring-project' into 'master'Rémy Coutable2017-06-091-2/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify transferring project, specify permissions See merge request !11934
| * | | | | | | | | | Clarify transferring project, specify permissionsLauri Piisang2017-06-091-2/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-17' into 'master'Rémy Coutable2017-06-091-0/+15
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update google.md See merge request !12010
| * | | | | | | | | | | Update google.mdKanchana Wickremasinghe2017-06-081-0/+15
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-triggered-builds' into 'master'Rémy Coutable2017-06-091-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix triggered CE builds Closes #33512 See merge request !12046
| * | | | | | | | | | | | Pass false to trigger if EE_PACKAGE not setfix-triggered-buildsBalasankar C2017-06-091-2/+7
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'add-note-renaming-moving-registry-container-user-docs' into ↵Marcia Ramos2017-06-091-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add note on moving or renaming registry repository See merge request !11882
| * | | | | | | | | | | | | Add note on moving or renaming registry repositoryadd-note-renaming-moving-registry-container-user-docsCindy Pallares 🦉2017-06-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per d5d8e76bd79cd9d61c66539a5069104cf46be2bd, any attempts to rename a container registry repository are blocked due to image signatures.
* | | | | | | | | | | | | | Merge branch '33315-es6-findindex-support' into 'master'Tim Zallmann2017-06-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Array `findIndex` support Closes #33315 See merge request !11961
| * | | | | | | | | | | | | Add Array `findIndex` support33315-es6-findindex-supportkushalpandya2017-06-071-0/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'pat-msg-on-auth-failure' into 'master'Rémy Coutable2017-06-097-10/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prompt user to create personal access token for Git over HTTP See merge request !11986
| * | | | | | | | | | | | | | Instruct user to use a personal access token for Git over HTTPRobin Bobbitt2017-06-077-10/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If internal auth is disabled and LDAP is not configured on the instance, present the user with a message to create a personal access token if his Git over HTTP auth attempt fails.
* | | | | | | | | | | | | | | Merge branch 'locales_fix' into 'master'Rémy Coutable2017-06-092-0/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Locales fix See merge request !12018
| * | | | | | | | | | | | | | Add german translation for time_ago_in_wordsHannes Rosenögger2017-06-082-0/+39
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '33467-remove-nicescroll' into 'master'Phil Hughes2017-06-093-48/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove nicescroll from job trace Closes #33467 and #33427 See merge request !12028
| * | | | | | | | | | | | | | | Remove nicescroll from job traceFilipa Lacerda2017-06-093-48/+59
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'dashboard-milestone-tabs-loading-async' into 'master'Sean McGivern2017-06-098-8/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed dashboard milestone tabs not loading Closes #33477 See merge request !12023
| * | | | | | | | | | | | | | | Fixed dashboard milestone tabs not loadingdashboard-milestone-tabs-loading-asyncPhil Hughes2017-06-098-8/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #33477
* | | | | | | | | | | | | | | | Merge branch '33381-display-issue-state-in-mr-widget-issue-links' into 'master'Sean McGivern2017-06-093-2/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display issue state in issue links section of merge request widget Closes #33381 See merge request !12021
| * | | | | | | | | | | | | | | Display issue state in issue links section of merge request widget33381-display-issue-state-in-mr-widget-issue-linksAdam Niedzielski2017-06-093-2/+28
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'rs-bootsnap' into 'master'Rémy Coutable2017-06-093-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Bootsnap to all environments to reduce application startup time Closes #33081 See merge request !12034