| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | Add serializer matchers | Kamil Trzcinski | 2017-10-02 | 2 | -16/+118 | |
| | | |/ / / | ||||||
| | * | | | | Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master' | Douwe Maan | 2017-10-04 | 1 | -12/+0 | |
| | |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Reduce method calls while evaluating Projects::MergeRequestsController#show.json See merge request gitlab-org/gitlab-ce!14285 | |||||
| | | * | | | Reduce method calls while evaluating Projects::MergeRequestsController#show.json36876-mr-show-json-controller-perf-improvements | Oswaldo Ferreira | 2017-10-04 | 1 | -12/+0 | |
| | | |/ / | ||||||
| | * | | | Resolve "Precompiled assets with digest strings are ignored in CI" | Mike Greiling | 2017-10-03 | 3 | -3/+3 | |
| | | | | | ||||||
| | * | | | Merge branch '36670-remove-edit-form' into 'master' | Sean McGivern | 2017-10-03 | 1 | -179/+140 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove edit action for issues Closes #36670 See merge request gitlab-org/gitlab-ce!14523 | |||||
| | | * | | | refactor issues_controller_spec `update` action | Jarka Kadlecova | 2017-10-03 | 1 | -157/+140 | |
| | | | | | | ||||||
| | | * | | | Remove edit action for issues | Jarka Kadlecova | 2017-10-03 | 1 | -29/+7 | |
| | | |/ / | ||||||
| | * | | | Merge branch 'sh-improve-perf-notes-actions' into 'master' | Douwe Maan | 2017-10-03 | 1 | -0/+34 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Improve performance of filtering notes in NotesController See merge request gitlab-org/gitlab-ce!14645 | |||||
| | | * | | | Improve performance of filtering notes in NotesControllersh-improve-perf-notes-actions | Stan Hu | 2017-10-02 | 1 | -0/+34 | |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduces the number of queries needed to redact notes to which the user does not have access. Also includes an N+1 query test as a guard against future issues. This is a follow-up from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14327#note_40976854. | |||||
| | * | | | Pulling merge_method spec for project_controller_spec from EE[ci skip] | Valery Sizov | 2017-09-20 | 1 | -0/+18 | |
| | |/ / | ||||||
| * | | | spacing and small optimisations | Alexandra | 2017-10-01 | 1 | -3/+4 | |
| | | | | ||||||
| * | | | must now set the devise default scope (since we now have an :email scope) | Brett Walker | 2017-09-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | and rubocop fixes | |||||
| * | | | allow a verified secondary email to be use as the primary without | Brett Walker | 2017-09-23 | 1 | -0/+14 | |
| | | | | | | | | | | | | | a reconfirmation | |||||
| * | | | fixes for rubocop | Brett Walker | 2017-09-23 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | tweaks for rubocop | Brett Walker | 2017-09-23 | 1 | -4/+3 | |
| | | | | ||||||
| * | | | add verified/unverified labels to profile emails. | Brett Walker | 2017-09-23 | 1 | -0/+15 | |
| | | | | | | | | | | | | | added "Resend confirmation email" for unverified emails | |||||
| * | | | Send a confirmation email when the user adds a secondary email address. ↵ | Brett Walker | 2017-09-23 | 1 | -0/+20 | |
| |/ / | | | | | | | Utilizes the Devise `confirmable` capabilities. Issue #37385 | |||||
| * | | Fix the filesystem shard health check to check all configured shards | Nick Thomas | 2017-09-19 | 1 | -0/+1 | |
| | | | ||||||
| * | | Merge branch 'zj-update-project-settings' into 'master' | Grzegorz Bizon | 2017-09-19 | 1 | -0/+43 | |
| |\ \ | | | | | | | | | | | | | | | | | | | Allow updating of project auto devops settings Closes #37893 See merge request gitlab-org/gitlab-ce!14291 | |||||
| | * | | Fix instance default option being true as value | Zeger-Jan van de Weg | 2017-09-18 | 1 | -1/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | When a user selected 'Instance default' as value for the auto devops settings, this was interpreted as a true value. Now we post an empty string in this case, meaning we want to set `NULL` in the database. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37893#note_40541294 | |||||
| | * | | Allow updating of project auto devops settings | Zeger-Jan van de Weg | 2017-09-15 | 1 | -0/+31 | |
| | |/ | | | | | | | | | | | | | Updating didn't work, as the project_id was missing to be set for the project_auto_devops model. Fixes gitlab-org/gitlab-ce#37893 | |||||
| * | | Eliminate N+1 queries in loading discussions.json endpointsh-optimize-discussion-json | Stan Hu | 2017-09-18 | 1 | -0/+32 | |
| |/ | | | | | | | | | | | | | | In #37955,we see that the profile had a number of N+1 queries from repeated access to `cross_reference_not_visible_for?`. This was optimized in previous versions of GitLab by rendering all notes at once, counting the number of visible references, and then using that number to check whether a system note should be fully redacted. There was also another N+1 query calling `ProjectTeam#member?`, which did not take advantage of an optimization in prepare_notes_for_rendering that would preload the maximum access level per project. Closes #37955 | |||||
| * | Merge branch '34510-board-issues-sql-speedup' into 'master' | Douwe Maan | 2017-09-14 | 1 | -0/+11 | |
| |\ | | | | | | | | | | | | | fix #34510 add association preloading for issue boards Closes #34510 See merge request gitlab-org/gitlab-ce!14198 | |||||
| | * | fix another N+1 query for label priorities34510-board-issues-sql-speedup | micael.bergeron | 2017-09-12 | 1 | -0/+11 | |
| | | | | | | | | | added a QueryRecorder for IssuesController#index.json | |||||
| * | | Merge branch 'revert-2f46c3a8' into 'master' | Robert Speicher | 2017-09-12 | 1 | -2/+4 | |
| |\ \ | |/ |/| | | | | | Revert "Merge branch 'revert-f2421b2b' into 'master'" See merge request !14190 | |||||
| | * | Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8 | Annabel Dunstone Gray | 2017-09-11 | 1 | -2/+4 | |
| | | | | | | | This reverts merge request !14148 | |||||
| * | | Resolve "Error 500 in non-UTF8 branch names" | Micael Bergeron | 2017-09-12 | 1 | -0/+15 | |
| |/ | ||||||
| * | Revert "Merge branch ↵revert-f2421b2b | Rubén Dávila | 2017-09-08 | 1 | -4/+2 | |
| | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619 | |||||
| * | Make Members with Owner and Master roles always able to create subgroups30473-allow-creation-of-subgroups-with-gitlab_default_can_create_group-set-to-false | Ruben Davila | 2017-09-07 | 1 | -0/+124 | |
| | | ||||||
| * | Merge branch ↵ | Sean McGivern | 2017-09-07 | 1 | -2/+4 | |
| |\ | | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619 | |||||
| | * | Restore some changes from !9199 | Rubén Dávila | 2017-09-06 | 1 | -2/+4 | |
| | | | ||||||
| * | | Merge branch 'ee_issue_928_backport' into 'master' | Sean McGivern | 2017-09-07 | 2 | -10/+24 | |
| |\ \ | |/ |/| | | | | | Group boards CE backport See merge request !13883 | |||||
| | * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Simon Knox | 2017-09-06 | 11 | -147/+352 | |
| | |\ | | | | | | | | | | ee_issue_928_backport | |||||
| | * | | Backport specs | Felipe Artur | 2017-08-31 | 2 | -10/+24 | |
| | | | | ||||||
| | * | | Continue BE backport | Felipe Artur | 2017-08-31 | 2 | -0/+0 | |
| | | | | ||||||
| * | | | Merge branch '35161_first_time_contributor_badge' into 'master' | Sean McGivern | 2017-09-06 | 1 | -0/+22 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | First time contributor badge Closes #35161 See merge request !13902 | |||||
| | * | | | add controller spec | micael.bergeron | 2017-09-06 | 1 | -0/+22 | |
| | | |/ | |/| | | | | | | | also fix some code styling issues | |||||
| * | | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master' | Kamil Trzciński | 2017-09-06 | 1 | -8/+0 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoint for downloading a single job artifact Closes #37196 See merge request !14027 | |||||
| | * \ \ | Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into ↵ | Grzegorz Bizon | 2017-09-06 | 1 | -0/+82 | |
| | |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | feature/gb/download-single-job-artifact-using-api * commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d': (210 commits) | |||||
| | * | | | Fix artifacts controller specs | Grzegorz Bizon | 2017-09-06 | 1 | -8/+0 | |
| | | | | | ||||||
| * | | | | Profile updates from providers | Alexander Keramidas | 2017-09-06 | 1 | -1/+24 | |
| | |/ / |/| | | ||||||
| * | | | Re-use issue/MR counts for the pagination systemmr-index-page-performance | Yorick Peterse | 2017-09-05 | 1 | -0/+82 | |
| |/ / | | | | | | | | | | | | | This changes the issue and MR index pages so the pagination system re-uses the output of the COUNT(*) query used to calculate the number of rows per state (opened, closed, etc). This removes the need for an additional COUNT(*) on both pages. | |||||
| * | | Move "Move to different project" to sidebar34261-move-move-to-sidebar | Eric Eastwood | 2017-09-03 | 2 | -117/+120 | |
| | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34261 | |||||
| * | | Merge branch 'issue-discussions-refactor' into 'master' | Jacob Schatz | 2017-09-02 | 2 | -5/+27 | |
| |\ \ | | | | | | | | | | | | | Issue discussions Vue refactor See merge request !12069 | |||||
| | * \ | Merge branch 'master' into issue-discussions-refactor | Douwe Maan | 2017-08-31 | 2 | -13/+32 | |
| | |\ \ | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb | |||||
| | * | | | Fix specs | Douwe Maan | 2017-08-30 | 1 | -5/+12 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' into issue-discussions-refactor | Douwe Maan | 2017-08-30 | 5 | -8/+63 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb | |||||
| | * \ \ \ | Merge branch 'master' into issue-discussions-refactor | Douwe Maan | 2017-08-23 | 1 | -10/+32 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json | |||||
| | * \ \ \ \ | Merge branch 'master' into issue-discussions-refactor | Douwe Maan | 2017-08-17 | 3 | -8/+10 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json # spec/support/features/reportable_note_shared_examples.rb | |||||
| | * | | | | | | fix static_analysis (rubocop) | Jarka Kadlecova | 2017-08-14 | 1 | -2/+1 | |
| | | | | | | | | ||||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |