summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Verify repository is validStan Hu2015-10-061-1/+1
| | | | | | |
| | * | | | | Fixes GDK issue where repos would not be imported properlyStan Hu2015-10-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seed-Fu runs this entire fixture in a transaction, so the `after_commit` hook won't run until after the fixture is loaded. That is too late since the Sidekiq::Testing block has already exited. Force clearing the `after_commit` queue to ensure the job is run now. See: gitlab-org/gitlab-development-kit#58
* | | | | | | Merge pull request #9693 from bbodenmiller/patch-1Stan Hu2015-10-081-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | allow crawling of commit page but not patch/diffs
| * | | | | | allow crawling of commit page but not patch/diffsBen Bodenmiller2015-10-041-1/+2
| | | | | | | | | | | | | | | | | | | | | Commit page has valuable information that search engines should be allowed to crawl however the .patch and .diff pages have no new information that is not on commit page
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-10-082-3/+12
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'update-upgrade-guide-for-redis-2.4.0' into 'master' Stan Hu2015-10-082-3/+12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update upgrade guide for Redis >= 2.4.0 requirement [ci skip] Closes #2837 See merge request !1468
| | * | | | | | | Update upgrade guide for Redis >= 2.4.0 requirementStan Hu2015-10-012-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Closes #2837
* | | | | | | | | Merge remote-tracking branch 'public/project-find-with-namespace-performance'Dmitriy Zaporozhets2015-10-0811-8/+301
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Added changelog for project namespace performanceYorick Peterse2015-10-081-0/+1
| | | | | | | | |
| * | | | | | | | Added dedicated Rake task for setting up PostgresYorick Peterse2015-10-082-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures any PostgreSQL specific schema changes (e.g. expression indexes) are created when setting up the database.
| * | | | | | | | Revamp finding projects by namespacesYorick Peterse2015-10-086-24/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using a JOIN we can remove the need for using 2 separate queries to find a project by its namespace. Combined with an index (only needed for PostgreSQL) this reduces the query time from ~245 ms (~520 ms for the first call) down to roughly 10 ms (~15 ms for the first call).
| * | | | | | | | Added concern for case-insensitive WHERE queriesYorick Peterse2015-10-072-0/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On PostgreSQL these queries use LOWER(...) to compare columns and values. For MySQL a regular WHERE is performed as MySQL is already case-insensitive.
| * | | | | | | | Added methods for detecting MySQL/PostgreSQLYorick Peterse2015-10-072-0/+28
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These two methods remove the need for manually going into ActiveRecord::Base.connection all over the place.
* | | | | | | | Merge remote-tracking branch 'public/trending-projects-performance'Dmitriy Zaporozhets2015-10-087-9/+141
|\ \ \ \ \ \ \ \
| * | | | | | | | Added changelog entry for trending projects tweakstrending-projects-performanceYorick Peterse2015-10-061-0/+1
| | | | | | | | |
| * | | | | | | | Added benchmarks for finding trending projectsYorick Peterse2015-10-062-0/+47
| | | | | | | | |
| * | | | | | | | Revamp trending projects queryYorick Peterse2015-10-064-33/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the query to use a COUNT nested in an INNER JOIN, instead of a COUNT plus a GROUP BY. There are two reasons for this: 1. Using a COUNT in an INNER JOIN can be quite a bit faster. 2. The use of a GROUP BY means that method calls such as "any?" (and everything else that calls "count") operate on a Hash that counts the amount of notes on a per project basis, instead of just counting the total amount of projects. The query has been moved into Project.trending as its logic is simple enough. As a result of this testing the TrendingProjectsFinder class simply involves testing if the right methods are called, removing the need for setting up database records.
| * | | | | | | | Use >= instead of > in TrendingProjectsFinderYorick Peterse2015-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using >= we can ensure we actually get all comments of the past month, instead of the comments of the past month minus the first day in the range.
| * | | | | | | | Added specs for TrendingProjectsFinderYorick Peterse2015-10-061-0/+43
| | | | | | | | |
* | | | | | | | | Merge branch 'implement-new-gitlab-colors' into 'master' Dmitriy Zaporozhets2015-10-085-127/+146
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new GitLab colors After this merge request all css must use variables for colours. ![7Od6vP7usJ__1_](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01dd327770f25c76448a5860a76e34c9/7Od6vP7usJ__1_.png) cc @skyruler See merge request !1542
| * | | | | | | | Improve help/ui pageDmitriy Zaporozhets2015-10-081-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Add new GitLab colorsDmitriy Zaporozhets2015-10-085-124/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch 'XenGi/gitlab-ce-master'Stan Hu2015-10-084-22/+26
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | hooks: Add full project namespace to payloadRicardo Band2015-10-024-22/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Payload of "project_member, :create" and "project_member, :destroy" now also have a field project_path_with_namespace.
* | | | | | | | | Merge branch 'rs-update-slack-notifier' into 'master' Dmitriy Zaporozhets2015-10-082-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update slack-notifier to ~> 1.2.0 Closes #2826 See merge request !1533
| * | | | | | | | | Update slack-notifier to ~> 1.2.0rs-update-slack-notifierRobert Speicher2015-10-072-3/+3
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs-update-tinder' into 'master' Dmitriy Zaporozhets2015-10-082-10/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update tinder to ~> 1.10.0 Closes #2823 See merge request !1534
| * | | | | | | | | Update tinder to ~> 1.10.0rs-update-tinderRobert Speicher2015-10-072-10/+10
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs-update-rack-cors' into 'master' Dmitriy Zaporozhets2015-10-083-6/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rack-cors to ~> 0.4.0 Closes #2800 See merge request !1536
| * | | | | | | | | Use `methods: :any` in our rack-cors configurationrs-update-rack-corsRobert Speicher2015-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added in rack-cors 0.4.0 and allows all types of CORS requests to the API.
| * | | | | | | | | Update rack-cors to ~> 0.4.0Robert Speicher2015-10-072-5/+5
| |/ / / / / / / /
* | | | | | | | | Merge branch 'rs-update-haml-rails' into 'master' Dmitriy Zaporozhets2015-10-082-4/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update haml-rails to ~> 0.9.0 Closes #2804 See merge request !1535
| * | | | | | | | | Update haml-rails to ~> 0.9.0rs-update-haml-railsRobert Speicher2015-10-072-4/+10
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix-build-highlight' into 'master' Dmitriy Zaporozhets2015-10-082-2/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build highlight Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @ayufan See merge request !1539
| * | | | | | | | | Fix build highlightDmitriy Zaporozhets2015-10-082-2/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch 'rs-quick-submit' into 'master' Douwe Maan2015-10-0816-20/+120
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "Quick Submit" JS behavior This takes the "Command+Enter" (or "Ctrl+Enter") quick-post behavior from the discussion field and expands it to fields throughout the application, most notably the issuable forms (e.g., New Issue, Edit Merge Request). See merge request !1516
| * | | | | | | | Check originalEvent.repeat *and* event.repeatrs-quick-submitRobert Speicher2015-10-072-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phantomjs < 2.0 doesn't support creating `KeyboardEvent` so the tests were failing on CI
| * | | | | | | | Check originalEvent.repeatRobert Speicher2015-10-072-2/+10
| | | | | | | | |
| * | | | | | | | Add CHANGELOG entry for "Quick Submit"Robert Speicher2015-10-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Quick Submit all the things!Robert Speicher2015-10-079-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds quick submit behavior to the forms for: - Blobs ("new file") - Commit messages - Issuables - Notes - Labels - Milestones - Wikis
| * | | | | | | | Remove "quick submit" behavior specific to the Notes JSRobert Speicher2015-10-071-7/+0
| | | | | | | | |
| * | | | | | | | Add "Quick Submit" JS behaviorRobert Speicher2015-10-073-0/+100
| | | | | | | | |
| * | | | | | | | Require jquery.turbolinks in all JS specsRobert Speicher2015-10-072-2/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Side-effect: This simplifies the requiresInput handler
* | | | | | | | Merge branch 'clarify-postfix' into 'master' Robert Speicher2015-10-072-7/+62
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify Reply by email settings when using Postfix mail server Fixes #2902. [ci skip] See merge request !1528
| * | | | | | | Clarify Reply by email settings when using Postfix mail serverclarify-postfixDouwe Maan2015-10-072-7/+62
| | | | | | | |
* | | | | | | | Merge branch 'stanhu/gitlab-ce-improve-label-milestones-filter'Dmitriy Zaporozhets2015-10-077-10/+55
|\ \ \ \ \ \ \ \
| * | | | | | | | Support filtering by "Any" milestone or issue and fix "No Milestone" and "No ↵Stan Hu2015-10-077-10/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Label" filters Closes #2619 Closes https://github.com/gitlabhq/gitlabhq/issues/9631
* | | | | | | | | Merge branch 'rs-update-omniauth-gems' into 'master' Dmitriy Zaporozhets2015-10-072-22/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update omniauth-* gem dependencies - twitter to `~> 1.2.0` - closes #2763 - kerberos to `~> 0.3.0` - closes #2792 - google-oauth2 to `~> 0.2.0` - shibboleth to `~> 1.2.0` - closes #2791 See merge request !1526
| * | | | | | | | | Update omniauth-shibboleth to ~> 1.2.0rs-update-omniauth-gemsRobert Speicher2015-10-062-5/+5
| | | | | | | | | |
| * | | | | | | | | Loosen omniauth-google-oauth2 to ~> 0.2.0Robert Speicher2015-10-061-1/+1
| | | | | | | | | |
View Lorry Controller Status