summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Speed up dashboard milestone index by scoping IssuesFinder to user ↵speed-up-dashboard-milestone-indexAdam Niedzielski2017-01-163-2/+12
| | | | | | | | | | | authorized projects It improves performance in dashboard milestone index page by passing a hint to "IssuesFinder". "IssuesFinder" generates a more performant query when it is limited to authorized projects for user. In the dashboard we already limit the projects to these authorized for user (see "Dashboard::ApplicationController#projects"), so we can safely pass this option to "IssuesFinder".
* Merge branch 'fix/rc-migration-typo' into 'master' Rémy Coutable2017-01-163-30/+58
|\ | | | | | | | | Yet another dot git migration fix See merge request !8592
| * fix typo, added relevant specfix/rc-migration-typoJames Lopez2017-01-163-30/+58
| |
* | Merge branch '22111-remove-lock-icon-on-protected-tag' into 'master' Clement Ho2017-01-162-1/+4
|\ \ | | | | | | | | | | | | | | | | | | Remove Lock Icon on Protected Tag Closes #22111 See merge request !8513
| * | Remove Lock Icon on Protected TagSergey Nikitin2017-01-142-1/+4
| | |
* | | Merge branch 'fix/diff-title' into 'master' Alfredo Sumaran2017-01-165-26/+55
|\ \ \ | |_|/ |/| | | | | | | | Fix issue with diff comments path See merge request !7819
| * | fixed commit diff linking and added specsfix/diff-titleLuke "Jared" Bennett2017-01-145-26/+55
| | |
* | | Merge branch 'fix/rc-migration-failure' into 'master' Sean McGivern2017-01-161-20/+40
|\ \ \ | | | | | | | | | | | | | | | | Fix migration failing when user has no projects See merge request !8589
| * | | fix typoJames Lopez2017-01-161-1/+1
| | | |
| * | | fix var inside loopJames Lopez2017-01-161-1/+3
| | | |
| * | | fix bug in loopJames Lopez2017-01-161-6/+2
| | | |
| * | | cope with namespace duplicated paths in any storageJames Lopez2017-01-161-14/+18
| | | |
| * | | fix nil path errorfix/rc-migration-failureJames Lopez2017-01-161-0/+2
| | | |
| * | | Remove rollback and fixed a couple of issuesJames Lopez2017-01-161-11/+8
| | | |
| * | | Fix remove dot git migration failing when user has no projectsJames Lopez2017-01-161-10/+29
|/ / / | | | | | | | | | | | | | | | - Fixed typo - Fixed migration when there are no projects and path is nil - Added path rollback that was missing if there was a SQL error
* | | Merge branch 'fix-deprecation-warning' into 'master' Rémy Coutable2017-01-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix a API deprecation warning See merge request !8587
| * | | Fix a API deprecation warningfix-deprecation-warningRobert Schilling2017-01-161-1/+1
| |/ /
* | | Merge branch 'pmq20/gitlab-ce-psvr/head/cache' into 'master' Yorick Peterse2017-01-165-16/+32
|\ \ \ | | | | | | | | | | | | | | | | Expire related caches after changing HEAD See merge request !8584
| * | | Expire related caches after changing HEADpmq20/gitlab-ce-psvr/head/cacheMinqi Pan2017-01-155-16/+32
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'dot-in-project-queries' into 'master' Rémy Coutable2017-01-163-7/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a constraint on the query parameter to allow querying for projects with dots in their name. See merge request !8210
| * | | | Add a constraint on the query parameter to allow querying for projects with ↵Bruno Melli2017-01-143-7/+16
| | | | | | | | | | | | | | | | | | | | dots in their name.
* | | | | Merge branch 'move-admin-groups-spinach-test-to-rspec' into 'master' Rémy Coutable2017-01-154-198/+111
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Move admin groups spinach tests to rspec See merge request !8313
| * | | | Move admin groups spinach tests to rspecSemyon Pupkov2016-12-274-198/+111
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | | 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
View Lorry Controller Status