summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Refactor Blob support of external storage in preparation of job artifact blobsdm-blob-external-storageDouwe Maan2017-05-031-2/+10
|
* Merge branch 'fix-gitaly-not-found' into 'master' Douwe Maan2017-05-022-34/+32
|\ | | | | | | | | Re-enable ref operations with gitaly after not-found fix See merge request !10773
| * Re-enable ref operations with gitaly after not-found fixfix-gitaly-not-foundAlejandro Rodríguez2017-05-022-34/+32
| |
* | Merge branch '30272-bvl-reject-more-namespaces' into 'master' Douwe Maan2017-05-028-8/+402
|\ \ | |/ |/| | | | | | | | | Reject more reserved paths Closes #30272 See merge request !10413
| * Update commentsBob Van Landuyt2017-05-021-0/+8
| |
| * Reuse Gitlab::Regex.full_namespace_regex in the DynamicPathValidatorBob Van Landuyt2017-05-021-0/+4
| |
| * Rename child namespaces in migrationhelpersBob Van Landuyt2017-05-012-2/+7
| |
| * Clear html cache for a projects milestonesBob Van Landuyt2017-05-011-0/+4
| |
| * Remove dependecy on `User`Bob Van Landuyt2017-05-011-20/+0
| |
| * Move ReservedPathsMigration into V1 namespaceBob Van Landuyt2017-05-0110-352/+362
| |
| * Minor style adjustmentsBob Van Landuyt2017-05-012-4/+5
| |
| * Clear cached markdown after renaming projectsBob Van Landuyt2017-05-013-3/+24
| |
| * Rename Projects & Namespaces based on entire pathsBob Van Landuyt2017-05-013-8/+13
| |
| * Use objects for renaming namespaces and projectsBob Van Landuyt2017-05-015-100/+119
| |
| * Rename projects in a migrationhelperBob Van Landuyt2017-05-013-23/+74
| |
| * Make renaming records in the database reusableBob Van Landuyt2017-05-013-48/+71
| | | | | | | | So we can use it for projects
| * Rename namespace-paths in a migration helperBob Van Landuyt2017-05-013-0/+232
| |
| * Move `replace_sql` into `Database::MigrationHelpers`Bob Van Landuyt2017-05-011-0/+23
| |
| * Rename `NamespaceValidator` to `DynamicPathValidator`Bob Van Landuyt2017-05-011-1/+1
| | | | | | | | This reflects better that it validates paths instead of a namespace model
| * Streamline the path validation in groups & projectsBob Van Landuyt2017-05-011-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | `Project` uses `ProjectPathValidator` which is now a `NamespaceValidator` that skips the format validation. That way we're sure we are using the same collection of reserved paths. I updated the path constraints to reflect the changes: We now allow some values that are only used on a top level namespace as a name for a nested group/project.
* | Merge branch 'gitaly-branch-tag-count' into 'master' Sean McGivern2017-05-022-6/+31
|\ \ | | | | | | | | | | | | | | | | | | Use Gitaly for getting Branch/Tag counts Closes gitaly#157 See merge request !10780
| * | Use Gitaly for getting Branch/Tag countsKim "BKC" Carlbäcker2017-04-282-6/+31
| |/ | | | | | | | | | | - Backup-rake-spec fixed. Storage config broken - Use rugged to compare branch/tag-count in specs - upgrade gitaly
* | Merge branch 'dont-blow-up-when-email-has-no-references-header' into 'master' Douwe Maan2017-05-011-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Don't blow up when email has no References header Closes gitlab-ee#2247 See merge request !11014
| * | Don't blow up when email has no References headerdont-blow-up-when-email-has-no-references-headerSean McGivern2017-05-011-0/+2
| |/ | | | | | | | | | | If an email doesn't match our incoming email patterns on the To header, we fall back to the References header. If there was no References header, we'd raise an exception, when we'd be better off acting as if it was empty.
* | Merge branch ↵Douwe Maan2017-05-011-3/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | '28968-revert-allow-people-with-merge-access-to-create-branches' into 'master' Prevent people from creating branches if they don't have persmission to push Closes #28968 See merge request !10983
| * | Prevent people from creating branches if they don't have persmission to pushPawel Chojnacki2017-04-281-3/+1
| |/
* | Fix Gitaly::Commit#is_ancestor30586-fix-gitaly-is-ancestorKim "BKC" Carlbäcker2017-04-282-13/+22
|/ | | | - Upgrade Gitaly-version
* Merge branch 'dm-blob-viewers' into 'master' Tim Zallmann2017-04-281-4/+0
|\ | | | | | | | | | | | | Refactor rich blob viewers and add Code|Rendered switch Closes #24287 See merge request !10566
| * Small code tweaksDouwe Maan2017-04-271-4/+0
| |
* | Merge branch '31138-improve-test-settings-for-services-in-empty-projects' ↵Douwe Maan2017-04-271-5/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | into 'master' improves test settings for chat notification services for empty projects Closes #31138 See merge request !10886
| * improves test settings for chat notification services for empty projects31138-improve-test-settings-for-services-in-empty-projectsTiago Botelho2017-04-271-5/+4
| |
* | Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-271-6/+17
|\ \ | | | | | | | | | | | | | | | | | | Fix ordering of commits in the network graph. Closes #30973 See merge request !10936
| * | Fix ordering of commits in the network graph.Timothy Andrew2017-04-271-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We upgraded `rugged` to 0.25.1.1 in !10286 for %9.1 - Prior to this upgrade, the default sort order for commits returned by `Gitlab::Git::Repository#find_commits` was `Rugged::SORT_DATE`, which the graph relied on. - While upgrading `rugged`, the MR also changed this default to `Rugged::SORT_NONE`, which broke commit ordering in the graph. - This commit adds an option to `Gitlab::Git::Repository#find_commits` to sort by date, and changes the graph builder `Network::Graph` so it explictly requests the `:date` sort order
* | | Remove unused optional parameter `asciidoc_opts`Toon Claes2017-04-271-8/+4
| | |
* | | Refactor MarkupHelperDouwe Maan2017-04-272-14/+2
| | |
* | | Cache the rendered README, but post-process on showToon Claes2017-04-272-4/+0
| | | | | | | | | | | | | | | | | | Because the post-processing of the rendered README is dependent on the context (i.e. the current user), do the post-processing when the README is being displayed.
* | | Submodule Dockerfile templatesZeger-Jan van de Weg2017-04-261-2/+2
| | |
* | | Load a project's CI status in batch from redisBob Van Landuyt2017-04-261-9/+44
| | |
* | | Decrease Cyclomatic Complexity threshold to 16Maxim Rydkin2017-04-261-40/+30
| | |
* | | Merge branch '20378-natural-sort-issue-numbers' into 'master'Sean McGivern2017-04-261-0/+29
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Change issues sentence to use natural sorting Closes #20378 See merge request !7110
| * | Change issues sentence to use natural sortingJeff Stubler2017-04-251-0/+29
| | |
* | | Merge branch 'mr-diff-size-overflow' into 'master' Douwe Maan2017-04-251-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Show correct size when MR diff overflows Closes #26560 See merge request !10827
| * | | Show correct size when MR diff overflowsSean McGivern2017-04-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that we often go via a diff object constructed from the diffs stored in the DB. Those diffs, by definition, don't overflow, so we don't have access to the 'correct' `real_size` - that is stored on the MR diff object iself.
* | | | Fix OAuth, LDAP and SAML SSO when regular sign-ups are disableddm-fix-oauth-user-creationDouwe Maan2017-04-241-1/+1
|/ / /
* | | Merge branch 'dm-fix-position-tracer-for-hidden-lines' into 'master' Sean McGivern2017-04-241-1/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix commenting on an existing discussion on an unchanged line that is no longer in the diff Closes #31339 See merge request !10888
| * | | Fix commenting on an existing discussion on an unchanged line that is no ↵Douwe Maan2017-04-241-1/+8
| | |/ | |/| | | | | | | longer in the diff
* | | Merge branch '30305-oauth-token-push-code' into 'master' Rémy Coutable2017-04-241-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow OAuth clients to push code Closes #30305 See merge request !10677
| * | | Allow OAuth clients to push code30305-oauth-token-push-codeTimothy Andrew2017-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We currently support fetching code with username = 'oauth2' and password = <access_token>. - Trying to _push_ code with the same credentials fails with an authentication error. - There's no reason this shouldn't be enabled, especially since we allow the OAuth client to create deploy keys with push access: https://docs.gitlab.com/ce/api/deploy_keys.html#add-deploy-key
* | | | Merge branch 'email-handler-metrics' into 'master' Sean McGivern2017-04-245-5/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make handler metric params more explicit See merge request !10854
| * | | | Make handler metric params more explicitemail-handler-metricsSean McGivern2017-04-215-5/+17
| | | | |