Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '30973-network-graph-sorted-by-date-and-topo' into 'master' | Douwe Maan | 2017-05-04 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Sort the network graph both by commit date and topographically Closes #30973 See merge request !11057 | ||||
| * | Sort the network graph both by commit date and topographically.30973-network-graph-sorted-by-date-and-topo | Timothy Andrew | 2017-05-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Previously, we sorted commits by date, which seemed to work okay. - The one edge case where this failed was when multiple commits have the same commit date (for example: when a range of commits are cherry picked with a single command, they all have the same commit date [and different author dates]). - Commits with the same commit date would be sorted arbitrarily, and usually break the network graph. - This commit solves the problem by both sorting by date, and by sorting topographically (parents aren't displayed until all their children are displayed) - Include review comments from @adamniedzielski A more detailed explanation is present here: https://gitlab.com/gitlab-org/gitlab-ce/issues/30973#note_28706230 | ||||
* | | Merge branch '2247-emails-forwarded-to-service-desk-email-don-t-come' into ↵ | Sean McGivern | 2017-05-04 | 1 | -0/+18 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | 'master' Handle incoming emails from aliases correctly See merge request !11079 | ||||
| * | | Handle incoming emails from aliases correctly2247-emails-forwarded-to-service-desk-email-don-t-come | Sean McGivern | 2017-05-03 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | These set the 'actual' destination email in one of the Delivered-To lines, so check those too. | ||||
* | | | Fix project tree saver and fork spec failures | James Lopez | 2017-05-03 | 1 | -2/+2 |
|/ / | |||||
* | | Fix lazy error handling of cron parser | Dosuken shinya | 2017-05-03 | 1 | -9/+79 |
| | | |||||
* | | Include missing project attributes to Import/Export | James Lopez | 2017-05-03 | 6 | -2/+40 |
|/ | |||||
* | Merge branch 'fix-gitaly-not-found' into 'master' | Douwe Maan | 2017-05-02 | 1 | -45/+60 |
|\ | | | | | | | | | 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-found | Alejandro Rodríguez | 2017-05-02 | 1 | -45/+60 |
| | | |||||
* | | Merge branch 'rs-described_class-cop-2' into 'master' | Douwe Maan | 2017-05-02 | 17 | -38/+38 |
|\ \ | | | | | | | | | | | | | Enable `RSpec/DescribedClass` cop and correct violations See merge request !10930 | ||||
| * | | Auto-correct `RSpec/DescribedClass` violationsrs-described_class-cop-2 | Robert Speicher | 2017-05-01 | 17 | -38/+38 |
| | | | |||||
* | | | Merge branch '30272-bvl-reject-more-namespaces' into 'master' | Douwe Maan | 2017-05-02 | 7 | -2/+566 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Reject more reserved paths Closes #30272 See merge request !10413 | ||||
| * | | Reuse Gitlab::Regex.full_namespace_regex in the DynamicPathValidator | Bob Van Landuyt | 2017-05-02 | 1 | -2/+2 |
| | | | |||||
| * | | Rename child namespaces in migrationhelpers | Bob Van Landuyt | 2017-05-01 | 2 | -14/+22 |
| | | | |||||
| * | | Clear html cache for a projects milestones | Bob Van Landuyt | 2017-05-01 | 1 | -0/+10 |
| | | | |||||
| * | | Move ReservedPathsMigration into V1 namespace | Bob Van Landuyt | 2017-05-01 | 4 | -14/+14 |
| | | | |||||
| * | | Clear cached markdown after renaming projects | Bob Van Landuyt | 2017-05-01 | 3 | -3/+64 |
| | | | |||||
| * | | Rename Projects & Namespaces based on entire paths | Bob Van Landuyt | 2017-05-01 | 2 | -0/+23 |
| | | | |||||
| * | | Use objects for renaming namespaces and projects | Bob Van Landuyt | 2017-05-01 | 4 | -148/+184 |
| | | | |||||
| * | | Add a WIP spec for clearing the cache | Bob Van Landuyt | 2017-05-01 | 2 | -0/+4 |
| | | | |||||
| * | | Rename projects in a migrationhelper | Bob Van Landuyt | 2017-05-01 | 3 | -39/+127 |
| | | | |||||
| * | | Make renaming records in the database reusable | Bob Van Landuyt | 2017-05-01 | 2 | -46/+103 |
| | | | | | | | | | | | | So we can use it for projects | ||||
| * | | Rename namespace-paths in a migration helper | Bob Van Landuyt | 2017-05-01 | 2 | -0/+237 |
| | | | |||||
| * | | Move `replace_sql` into `Database::MigrationHelpers` | Bob Van Landuyt | 2017-05-01 | 1 | -0/+33 |
| | | | |||||
| * | | Streamline the path validation in groups & projects | Bob Van Landuyt | 2017-05-01 | 1 | -0/+7 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | `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 McGivern | 2017-05-02 | 1 | -13/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Use Gitaly for getting Branch/Tag counts Closes gitaly#157 See merge request !10780 | ||||
| * | | Fix RSpec | Kim "BKC" Carlbäcker | 2017-04-28 | 1 | -13/+1 |
| | | | |||||
* | | | Merge branch 'fix/add-specs-for-request-profiler' into 'master' | Douwe Maan | 2017-05-01 | 1 | -0/+27 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add specs for Gitlab::RequestProfiler Closes #31513 See merge request !11005 | ||||
| * | | | Add specs for Gitlab::RequestProfiler | Ahmad Sherif | 2017-05-01 | 1 | -0/+27 |
| | |/ | |/| | | | | | | | Closes #31513 | ||||
* | | | Merge branch 'dont-blow-up-when-email-has-no-references-header' into 'master' | Douwe Maan | 2017-05-01 | 1 | -1/+9 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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-header | Sean McGivern | 2017-05-01 | 1 | -1/+9 |
| |/ / | | | | | | | | | | | | | | | | 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 Maan | 2017-05-01 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | '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 push | Pawel Chojnacki | 2017-04-28 | 1 | -2/+2 |
| |/ | |||||
* | | Merge branch 'enable-spec-file-name-cop' into 'master' | Robert Speicher | 2017-04-28 | 9 | -122/+3 |
|\ \ | |/ |/| | | | | | | | | | Enable RSpec/FilePath cop Closes #31316 See merge request !10911 | ||||
| * | Enable RSpec/FilePath copenable-spec-file-name-cop | Sean McGivern | 2017-04-26 | 9 | -122/+3 |
| | | | | | | | | | | | | - Ignore JS fixtures - Ignore qa directory - Rewrite concern specs to put concern name first | ||||
* | | Merge branch 'remove-invalid-services' into 'master' | Douwe Maan | 2017-04-27 | 2 | -23/+20 |
|\ \ | | | | | | | | | | | | | Remove invalid services with nil or empty type See merge request !10847 | ||||
| * | | tadds migration to remove invalid services | Tiago Botelho | 2017-04-27 | 2 | -23/+20 |
| | | | |||||
* | | | Merge branch '30973-fix-network-graph-ordering' into 'master' | Douwe Maan | 2017-04-27 | 1 | -0/+29 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix ordering of commits in the network graph. Closes #30973 See merge request !10936 | ||||
| * | | | Fix ordering of commits in the network graph. | Timothy Andrew | 2017-04-27 | 1 | -0/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 Claes | 2017-04-27 | 1 | -19/+2 |
| | | | | |||||
* | | | | Fix failing specs | Toon Claes | 2017-04-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser' | Sean McGivern | 2017-04-27 | 1 | -2/+8 |
|\ \ \ \ | |||||
| * | | | | Fix rendering emoji inside a string | blackst0ne | 2017-04-25 | 1 | -2/+8 |
| | | | | | |||||
* | | | | | Load a project's CI status in batch from redis | Bob Van Landuyt | 2017-04-26 | 1 | -14/+128 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch '20378-natural-sort-issue-numbers' into 'master' | Sean McGivern | 2017-04-26 | 1 | -0/+62 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change issues sentence to use natural sorting Closes #20378 See merge request !7110 | ||||
| * | | | | Change issues sentence to use natural sorting | Jeff Stubler | 2017-04-25 | 1 | -0/+62 |
| | | | | | |||||
* | | | | | Merge branch '31280-skip-issueables-without-project' into 'master' | Sean McGivern | 2017-04-26 | 1 | -25/+52 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip issuable without a project in IssuableExtractor#extract Closes #31280 See merge request !10906 | ||||
| * | | | | | Follow feedback on the review | Lin Jen-Shin | 2017-04-26 | 1 | -23/+47 |
| | | | | | | |||||
| * | | | | | Skip issuable without a project in IssuableExtractor#extract | Lin Jen-Shin | 2017-04-25 | 1 | -55/+58 |
| | |_|_|/ | |/| | | | | | | | | | | | | | Closes #31280 | ||||
* | | | | | Ensures that OAuth/LDAP/SAML users don't need to be confirmed | Rémy Coutable | 2017-04-26 | 3 | -0/+41 |
| |_|_|/ |/| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> |