summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use gitaly_migrate helper on all current migrations in repositoryuse-gitaly-migrateAlejandro Rodríguez2017-05-111-3/+3
|
* Merge branch 'pipeline-schedules-callout-docs-url' into 'master' Filipa Lacerda2017-05-115-11/+37
|\ | | | | | | | | | | | | Set correct docsUrl in pipeline schedules callout component. Closes #31957 See merge request !11216
| * Pass docsUrl to pipeline schedules callout component.pipeline-schedules-callout-docs-urlBryce Johnson2017-05-115-11/+37
| |
* | Merge branch '28558-update-copy' into 'master' Filipa Lacerda2017-05-111-2/+2
|\ \ | | | | | | | | | | | | Update copy on Create merge request dropdown See merge request !11304
| * | Update copy on Create merge request dropdownAlfredo Sumaran2017-05-111-2/+2
| | |
* | | Merge branch '32091-empty-pipeline-svg' into 'master' Filipa Lacerda2017-05-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix overlapping lines in SVG Closes #32091 See merge request !11299
| * | | Fix overlapping lines in SVGAnnabel Dunstone Gray2017-05-111-1/+1
| | | |
* | | | Merge branch 'remove-balsamiq-module-from-common_vue-bundle' into 'master' Filipa Lacerda2017-05-111-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove balsamiq module from common_vue bundle Closes #32092 See merge request !11248
| * | | | Remove balsamiq module from common_vue bundleremove-balsamiq-module-from-common_vue-bundleLuke "Jared" Bennett2017-05-101-1/+0
| | | | |
* | | | | Merge branch 'winh-sidebar-mock-fix' into 'master' Filipa Lacerda2017-05-113-0/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Add missing tear down of sidebarMockInterceptor Closes #32020 See merge request !11204
| * | | | Add missing tear down of sidebarMockInterceptor (!11204)winh-sidebar-mock-fixwinh2017-05-113-0/+3
| | | | |
* | | | | Merge branch 'use-common-vue-for-filtered-search' into 'master' Clement Ho2017-05-114-5/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ensure filtered_search utilizes common_vue bundle See merge request !11273
| * | | | | ensure filtered_search utilizes common_vue bundleuse-common-vue-for-filtered-searchMike Greiling2017-05-104-5/+8
| | | | | |
* | | | | | Merge branch 'winh-pipeline-author-link' into 'master' Filipa Lacerda2017-05-119-218/+149
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to commit author user page from pipelines Closes #29368 See merge request !11100
| * | | | | Link to commit author user page from pipelines (!11100)winh2017-05-112-8/+11
| | | | | |
| * | | | | Add failing test for #29368winh2017-05-111-11/+79
| | | | | |
| * | | | | Replace pipeline mock data with JSON fixturewinh2017-05-107-202/+62
| | | | | |
* | | | | | Merge branch 'update-database-requirements' into 'master' Rémy Coutable2017-05-111-5/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update DB requirements in the documentation See merge request !11293
| * | | | | | Update DB requirements in the documentationupdate-database-requirementsYorick Peterse2017-05-111-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it more obvious that we greatly prefer PostgreSQL over MySQL/MariaDB and that all users are recommended to use PostgreSQL instead. This also removes the paragraph mentioning the size per user row, as this is completely inaccurate and doesn't really help users with anticipating the database size. Instead we now simply recommend users to have at least 5-10 GB of storage at minimum. [ci skip]
* | | | | | | Merge branch 'zj-clean-up-ci-variables-table' into 'master' Yorick Peterse2017-05-117-5/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up ci variables table Closes #31799 See merge request !11186
| * | | | | | | Remove rails dependent: :destroy statementZ.J. van de Weg2017-05-115-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enforced by the database, and no callbacks need to be called. Combined with 7b9b2c6099 and 294a8b8a6d this resolves gitlab-org/gitlab-ce#31799
| * | | | | | | Add a foreign key to ci_variables to projectsZ.J. van de Weg2017-05-113-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Variables shouldn't exist without a project, so a foreign key was added with CASCADE'ing effects.
| * | | | | | | Prevent NULL values on ci_variables columnsZ.J. van de Weg2017-05-111-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be more specific; key, and project_id. If either of these is NULL its wrong, because: 1. storing a key value pair without key is just plain wrong 2. all variables should belong to a project Non of these cases existed on the staging database.
* | | | | | | | Merge branch 'bvl-mysql-rename-concurrently' into 'master' Yorick Peterse2017-05-111-10/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new column before creating rename triggers See merge request !11297
| * | | | | | | | Add a new column before creating rename triggersBob Van Landuyt2017-05-111-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL doesn't allow us to create a trigger for a column that doesn't exist yet. Failing with this error: ``` Mysql2::Error: Unknown column 'build_events' in 'NEW': CREATE TRIGGER trigger_6a80c097c862_insert BEFORE INSERT ON `services` FOR EACH ROW SET NEW.`build_events` = NEW.`job_events` ``` Creating the new column before creating the trigger avoids this.
* | | | | | | | | Merge branch 'patch-20' into 'master'Rémy Coutable2017-05-111-4/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update installation.md - Updated the Ruby section. See merge request !11251
| * | | | | | | | | Update installation.md - Updated the Ruby section. Luís Pedro Algarvio2017-05-101-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes my previous my old obsolete/forgotten pull request / patch (sorry about that): #6262 https://github.com/lpalgarvio/gitlabhq/tree/patch-1
* | | | | | | | | | Merge branch 'patch-20' into 'master' Rémy Coutable2017-05-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed small typo - piplnie should be pipeline See merge request !11296
| * | | | | | | | | | fixed small typo - piplnie should be pipelineOche Ejembi2017-05-111-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mr-tabs-sticky-poc' into 'master' 32156-link-to-member-avatarAnnabel Dunstone Gray2017-05-112-2/+14
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | POC: Use position sticky on merge request tabs See merge request !11289
| * | | | | | | | | Use position sticky on merge request tabsmr-tabs-sticky-pocPhil Hughes2017-05-112-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the need for Bootstraps affix on browser that support sticky positions. On these browsers, there should be a slight performance improvement as there will be no scrolling events, it will all be handled by the browser
* | | | | | | | | | Merge branch 'issue-templates-summary-lines' into 'master' Rémy Coutable2017-05-112-0/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add summary lines for collapsed details in the bug report template See merge request !11280
| * | | | | | | | | Add summary lines for collapsed details in the bug report templateMark Fletcher2017-05-112-0/+6
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
* | | | | | | | | 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