summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Pass docsUrl to pipeline schedules callout component.pipeline-schedules-callout-docs-urlBryce Johnson2017-05-115-11/+37
|
* Merge branch '31781-print-rendered-files-not-possible' into 'master' Annabel Dunstone Gray2017-05-112-3/+9
|\ | | | | | | | | | | | | Include blob content when printing page Closes #31781 See merge request !11247
| * Include blob content when printing page31781-print-rendered-files-not-possibleSam Rose2017-05-102-3/+9
| |
* | Merge branch 'docs/complement-tech-articles' into 'master' Sean Packham (GitLab)2017-05-117-12/+25
|\ \ | | | | | | | | | | | | Complement tech articles guidelines See merge request !11260
| * | Complement tech articles guidelinesMarcia Ramos2017-05-117-12/+25
|/ /
* | Merge branch 'patch-18' into 'master' Achilleas Pipinellis2017-05-111-1/+1
|\ \ | | | | | | | | | | | | Update getting_started_part_one.md. See merge request !11020
| * | Update getting_started_part_one.md. Minor spelling error.Kevin Nesmith2017-05-011-1/+1
| | |
* | | Merge branch 'docs/fix-broken-link' into 'master' Achilleas Pipinellis2017-05-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix a broken link for the "How to Configure LDAP with GitLab EE" article See merge request !11114
| * | | Fix a broken link for the "How to Configure LDAP with GitLab EE" articledocs/fix-broken-linkRémy Coutable2017-05-051-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'master' into 'master' Achilleas Pipinellis2017-05-111-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update README.md with Authentication projects example See merge request !11162
| * | | | Update README.md with projects exampleToni2017-05-081-2/+3
| | | | |
* | | | | Merge branch 'dm-fix-mysql-failure' into 'master' Sean McGivern2017-05-112-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MySQL build failure Closes #32106 See merge request !11277
| * | | | | Fix MySQL build failuredm-fix-mysql-failureDouwe Maan2017-05-102-2/+2
| | | | | |
* | | | | | Merge branch '32016-slash-command-strip-fix' into 'master' Filipa Lacerda2017-05-112-7/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix slash commands detection in comments Closes #32016 See merge request !11265
| * | | | | | Fix slash commands detection in commentsKushal Pandya2017-05-112-7/+20
|/ / / / / /
* | | | | | Merge branch '32045-vue-warn-cannot-find-element-issuable-time-tracker' into ↵Phil Hughes2017-05-111-42/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove sidebar bundle spec Closes #32045 See merge request !11223
| * | | | | | Remove sidebar bundle spec32045-vue-warn-cannot-find-element-issuable-time-trackerClement Ho2017-05-101-42/+0
| | | | | | |
* | | | | | | Merge branch 'issue_api_change' into 'master' Sean McGivern2017-05-111-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue API change: assignee_id parameter and assignee object in a response See merge request !11271
| * | | | | | | Issue API change: assignee_id parameter and assignee object in a responseissue_api_changeValery Sizov2017-05-111-0/+5
| | | | | | | |
* | | | | | | | Merge branch 'dm-auxiliary-viewers' into 'master' Sean McGivern2017-05-1132-140/+616
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement auxiliary blob viewers See merge request !11195
| * | | | | | | | Add changelogdm-auxiliary-viewersDouwe Maan2017-05-101-0/+5
| | | | | | | | |
| * | | | | | | | Reset Repository#license memo when license file is changedDouwe Maan2017-05-102-8/+15
| | | | | | | | |
| * | | | | | | | Implement auxiliary blob viewersDouwe Maan2017-05-1031-134/+598
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '32087-fix-flickering-system-notes' into 'master' Phil Hughes2017-05-111-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix flickering of system notes Closes #32087 See merge request !11281
| * | | | | | | | Fix flickering of system notes32087-fix-flickering-system-notesEric Eastwood2017-05-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32087 Easy reproduction: 1. Edit an issue title 1. Notice the system note added 1. Switch to another tab and back (to fire the polling immediately) 1. Notice the flicker (without this fix)
* | | | | | | | | Merge branch ↵Phil Hughes2017-05-114-3/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31625-tag-editor-loses-all-inputs-when-you-try-to-add-a-tag-that-already-exists' into 'master' Resolve "Tag editor loses all inputs when you try to add a tag that already exists" Closes #31625 See merge request !11155
| * | | | | | | | | Keep input data after creating existing tagSam Rose2017-05-104-3/+10
| | | | | | | | | |
* | | | | | | | | | Merge branch '32094-custom-notifications-model-aria-labelledby-incorrect' ↵Phil Hughes2017-05-111-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix aria labels on custom notifications modal Closes #32094 See merge request !11256
| * | | | | | | | | Fix aria labels on custom notifications modal32094-custom-notifications-model-aria-labelledby-incorrectSam Rose2017-05-101-3/+3
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix-shortcuts_spec-explore-page-transient-failure' into 'master' Douwe Maan2017-05-111-14/+17
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find the nothing-here-block before asserting page content when on explore page of shortcuts_spec.rb See merge request !11250
| * | | | | | | | | Fix `send_key` to `send_keys` and add EOF newlinefix-shortcuts_spec-explore-page-transient-failureLuke "Jared" Bennett2017-05-101-3/+3
| | | | | | | | | |
| * | | | | | | | | Find the nothing-here-block before asserting page content when on explore ↵Luke "Jared" Bennett2017-05-101-15/+18
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | page of shortcuts_spec.rb
* | | | | | | | | Merge branch 'docs/hide-gcp-install' into 'master' Marcia Ramos2017-05-102-2/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide GCP install guide from index page until our image is released Closes omnibus-gitlab#2326 See merge request !11213
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 'docs/hide-gcp-install'docs/hide-gcp-installAchilleas Pipinellis2017-05-10276-1218/+3853
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | # Conflicts: # doc/install/README.md
| * | | | | | | | | Hide GCP install guide from index page until our image is addedAchilleas Pipinellis2017-05-092-2/+4
| | | | | | | | | |
* | | | | | | | | | Merge branch 'retried-in-database-mysql' into 'master' Regis Boudinot2017-05-1018-41/+152
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retried in database Closes #25737 See merge request !11115
| * | | | | | | | | | Fix rubocop failureKamil Trzcinski2017-05-091-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Make retried to be nullableKamil Trzcinski2017-05-096-14/+8
| | | | | | | | | | |
| * | | | | | | | | | Store retried in database for CI buildsretried-in-database-mysqlKamil Trzcinski2017-05-0718-41/+158
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'winh-pending-ajax-cache' into 'master' Clement Ho2017-05-102-38/+89
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track pending requests in AjaxCache See merge request !11170
| * | | | | | | | | | | Track pending requests in AjaxCacheWinnie Hellmann2017-05-102-38/+89
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'enforce-current-user-usage-on-entities' into 'master' Kamil Trzciński2017-05-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make all Serializers receive `current_user` instead `user` [CE] See merge request !11254
| * | | | | | | | | | | Remove unnecessary user hash being passed to DeploymentSerializerenforce-current-user-usage-on-entitiesOswaldo Ferreira2017-05-101-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Ensure all Serializers receive `current_user` instead `user`Oswaldo Ferreira2017-05-101-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into ↵Robert Speicher2017-05-10153-218/+217
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063
| * | | | | | | | | | | | Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-1049-62/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-10113-156/+157
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch 'fix-api-headings' into 'master' Achilleas Pipinellis2017-05-1014-14/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "API" to API docs Closes #32105 See merge request !11261
| * | | | | | | | | | | update API doc with +API (h1 heading)Marcia Ramos2017-05-1014-14/+14
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'bvl-security-patches' into 'master' Robert Speicher2017-05-1056-311/+831
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Security patches -> `master` See merge request !11230