summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '26698-fix-master' into 'master' Rémy Coutable2017-01-151-1/+1
|\ | | | | | | | | | | | | Remove trailing whitespace Closes #26698 See merge request !8581
| * Remove trailing whitespaceRémy Coutable2017-01-151-1/+1
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'pipelines_missing_pagination' into 'master' Fatih Acet2017-01-154-10/+19
|\ \ | | | | | | | | | | | | fix pagination component handling different header styles from different server proxies See merge request !8569
| * | change how pagination component is loadedpipelines_missing_paginationRegis2017-01-153-2/+1
| | |
| * | fix pagination component handling different header styles from different ↵Regis2017-01-131-8/+18
| | | | | | | | | | | | server proxies
* | | Merge branch 'allow_plus_sign_for_snippets' into 'master' Rémy Coutable2017-01-153-2/+20
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Allow to use '+' symbol in filenames Closes #22859 See merge request !6644
| * | Allow to use + symbol in filenamesblackst0ne2017-01-153-2/+20
| | |
* | | Merge branch 'class-name-to-string' into 'master' Rémy Coutable2017-01-152-3/+3
|\ \ \ | |/ / |/| | | | | | | | Use string for class_name option for lazy autoload class See merge request !8580
| * | Use string for class_name option for lazy autoload classSemyon Pupkov2017-01-152-3/+3
| | | | | | | | | | | | | | | Passing constant into this option is deprecated in Rails 5.2 https://github.com/rails/rails/commit/8312a0d22212798864f142b5a94805e0baa6c562
* | | Merge branch 'patch-1' into 'master' Rémy Coutable2017-01-151-1/+10
|\ \ \ | | | | | | | | | | | | | | | | existing folders and existing repos should not use the same set of instructions … See merge request !3446
| * | | existing folders and existing repos should not use the same set of ↵keen992016-03-291-1/+10
| | | | | | | | | | | | | | | | instructions - pushing an existing repo into gitlab using the previous instructions would result in loss (at the gitlab remote end) of exist branches and tags. so lets push those!
* | | | Merge branch 'patch-2' into 'master' Rémy Coutable2017-01-151-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | use plain shell See merge request !3509
| * | | use plain shell Elan Ruusamäe2016-04-031-1/+1
| | | | | | | | | | | | no bashism detected here
* | | | Merge branch 'bug/project-feature-compatibility' into 'master' Douwe Maan2017-01-142-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mutate the attribute instead of issuing a write operation to the DB in `ProjectFeaturesCompatibility` concern. Closes gitlab-ee#1520 See merge request !8552
| * | | | Mutate the attribute instead of issuing a write operation to the DBbug/project-feature-compatibilityGabriel Mazetto2017-01-122-1/+6
| | | | | | | | | | | | | | | | | | | | This fixes gitlab-org/gitlab-ee#1520
* | | | | Merge branch ↵Douwe Maan2017-01-142-5/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25018-gitlab-checks-changeaccess-looks-for-user-permissions-that-don-t-exist' into 'master' Resolve "`Gitlab::Checks::ChangeAccess` looks for user permissions that don't exist" Closes #25018 See merge request !8551
| * | | | | Remove useless permission checks in Gitlab::Checks::ChangeAccess25018-gitlab-checks-changeaccess-looks-for-user-permissions-that-don-t-existRémy Coutable2017-01-122-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '26587-metrics-middleware-endpoint-is-nil' into 'master' Yorick Peterse2017-01-143-4/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Metrics middleware: endpoint is nil" Closes #26587 See merge request !8544
| * | | | | | Check for env[Grape::Env::GRAPE_ROUTING_ARGS] instead of endpoint.route26587-metrics-middleware-endpoint-is-nilRémy Coutable2017-01-123-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `endpoint.route` is calling `env[Grape::Env::GRAPE_ROUTING_ARGS][:route_info]` but `env[Grape::Env::GRAPE_ROUTING_ARGS]` is `nil` in the case of a 405 response Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'fix-build-sort-order' into 'master' Robert Speicher2017-01-134-1/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Sort order for pipeline build lists doesn't properly handle numbers" Closes #25428 See merge request !8277
| * | | | | | | revise sortable_name test formattingMike Greiling2017-01-131-4/+1
| | | | | | | |
| * | | | | | | prefer unit test on model over view testfix-build-sort-orderMike Greiling2017-01-022-35/+22
| | | | | | | |
| * | | | | | | rename sort methodMike Greiling2017-01-022-2/+2
| | | | | | | |
| * | | | | | | add CHANGELOG.md entry for !8277Mike Greiling2017-01-021-0/+4
| | | | | | | |
| * | | | | | | add tests for natural sorting of build namesMike Greiling2017-01-021-0/+35
| | | | | | | |
| * | | | | | | add natural sorting token for build namesMike Greiling2017-01-022-1/+7
| | | | | | | |
* | | | | | | | Merge branch 'fix-single-team-specs' into 'master' Robert Speicher2017-01-132-8/+88
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve single mattermost team select disabled state See merge request !8276
| * | | | | | | | Improve disabled state selectfix-single-team-specsLuke "Jared" Bennett2017-01-132-8/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests
* | | | | | | | | Merge branch 'fix/merge-separate-build-spec-files' into 'master' Robert Speicher2017-01-132-1341/+1275
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge separate build spec files into one in correct location Closes #24579 See merge request !8564
| * | | | | | | | | Fix Rubocop offense in build specsfix/merge-separate-build-spec-filesGrzegorz Bizon2017-01-131-1/+0
| | | | | | | | | |
| * | | | | | | | | Remove empty build spec file from invalid locationGrzegorz Bizon2017-01-131-6/+0
| | | | | | | | | |
| * | | | | | | | | Merge build specs into file that has valid locationGrzegorz Bizon2017-01-132-1335/+1276
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'fix/serialized-commit-path' into 'master' Rémy Coutable2017-01-133-4/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update commit entity to point to valid commit page Closes #26624 See merge request !8558
| * | | | | | | | | Add Changelog for commit links fix on pipelines pagefix/serialized-commit-pathGrzegorz Bizon2017-01-131-0/+4
| | | | | | | | | |
| * | | | | | | | | Update commit entity to point to valid commit pageGrzegorz Bizon2017-01-132-4/+6
| |/ / / / / / / /
* | | | | | | | | Merge branch 'zj-fix-broken-link-docs' into 'master' Robert Speicher2017-01-131-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken link in docs Closes #26544 [ci skip] See merge request !8529
| * | | | | | | | | Fix broken link in docszj-fix-broken-link-docsZ.J. van de Weg2017-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch 'env-var-in-redis-config' into 'master' Rémy Coutable2017-01-135-2/+28
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to use ENV variables in redis config See merge request !8073
| * | | | | | | | | | Allow to use ENV variables in redis configSemyon Pupkov2017-01-135-2/+28
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'milestone-issuable-labels-spacing' into 'master' Annabel Dunstone Gray2017-01-131-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed spacing of labels in issuable row on milestone#show See merge request !8563
| * | | | | | | | | | Fixed spacing of labels in issuable row on milestone#showPhil Hughes2017-01-131-0/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'fix-ruby21-milestone-api-specs' into 'master' Sean McGivern2017-01-131-3/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix milestone API specs in Ruby 2.1 See merge request !8555
| * | | | | | | | | | Put .gitlab-ci.yml back to only 2.1 on masterSean McGivern2017-01-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | Only escape the 'No Milestone' paramfix-ruby21-milestone-api-specs-2Sean McGivern2017-01-132-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is less invasive than the parent commit.
| * | | | | | | | | | Fix milestone API specs in Ruby 2.1fix-ruby21-milestone-api-specsSean McGivern2017-01-132-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 2.3: ``` URI.parse('http://foo/bar?baz quux') => #<URI::HTTP http://foo/bar?baz%20quux> ``` Ruby 2.1: ``` URI.parse('http://foo/bar?baz quux') URI::InvalidURIError: bad URI(is not URI?): http://foo/bar?baz quux ```
* | | | | | | | | | | Merge branch 'fix/git-migration' into 'master' Sean McGivern2017-01-131-4/+11
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add check for new path existence Closes #26641 See merge request !8554
| * | | | | | | | | | Add check for new path existenceJames Lopez2017-01-131-4/+11
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'clipboard-button-text' into 'master' Sean McGivern2017-01-135-7/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy <some text> to clipboard See merge request !8535
| * | | | | | | | | | Text for copy to clipboard: URL, personal access token, commands, referenceclipboard-button-textvictorwu2017-01-125-7/+10
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '23194-fix-no-milestone-option-for-projects-endpoint' into ↵Sean McGivern2017-01-134-24/+112
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fixes the incoherent filtering by milestone in `/projects/:id/issues` and `/groups/:id/issues` endpoints Closes #23194 See merge request !8457
View Lorry Controller Status