summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Hide Gollum inside Gitlab::Git::WikiJacob Vosmaer2017-10-031-10/+6
|
* Merge branch 'sh-improve-perf-notes-actions' into 'master'Douwe Maan2017-10-031-1/+1
|\ | | | | | | | | 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-actionsStan Hu2017-10-021-1/+1
| | | | | | | | | | | | | | | | 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.
* | Merge branch 'ff_port_from_ee' into 'master'Sean McGivern2017-10-031-0/+1
|\ \ | |/ |/| | | | | Move Fast-Forward Merge to CE See merge request gitlab-org/gitlab-ce!14272
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_eeValery Sizov2017-10-023-0/+11
| |\
| * \ Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-2813-26/+48
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/project.rb db/schema.rb
| * \ \ Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-264-16/+36
| |\ \ \
| * | | | Fast forward merge: basic implemenation[ci skip]Valery Sizov2017-09-191-0/+1
| | | | |
* | | | | Merge branch 'enhance-logging' into 'master'Robert Speicher2017-10-024-3/+22
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Improved file logging for authentication events See merge request gitlab-org/gitlab-ce!9196
| * | | | Remove lock reason and add guard clauseBrian Neel2017-09-291-1/+3
| | | | |
| * | | | Standardize capitalization and statusBrian Neel2017-09-272-4/+4
| | | | |
| * | | | # This is a combination of 1 commit.Brian Neel2017-09-274-3/+20
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # This is the 1st commit message: Add logging for all web authentication events # This is the commit message #2: Re-add underscore to after_inactive_sign_up_path_for # This is the commit message #3: Standardize on username= # This is the commit message #4: after_filter -> after_action, _resource -> resource # This is the commit message #5: Add two-factor login failures and account lockouts # This is the commit message #6: Move logging from two-factor concern to user model # This is the commit message #7: Add spaces around default parameter assignments # This is the commit message #8: Move logs out of user model # This is the commit message #9: Replace filtered_params with user_params # This is the commit message #10: Standardize case # This is the commit message #1: Fixes for username and AppLogger.info
* | | | Merge branch 'dm-json-page-title' into 'master'Jacob Schatz2017-09-293-0/+11
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Use backend-provided page title in repo editor Closes #36029 See merge request gitlab-org/gitlab-ce!13763
| * | | Encode Page-Title header as ISO-8859-1Douwe Maan2017-09-261-1/+2
| | | |
| * | | Add Page-Title header to tree and blob JSON endpointsDouwe Maan2017-09-263-0/+10
| | | |
* | | | refactor emails servicerefactor-servicesJames Lopez2017-09-282-3/+3
| | | |
* | | | refactor users update serviceJames Lopez2017-09-288-17/+17
| | | |
* | | | refactor keys controllerJames Lopez2017-09-281-1/+7
| | | |
* | | | refactor some controllers to make them EE friendlyJames Lopez2017-09-283-5/+21
| | | |
* | | | refactor services to match EE signatureJames Lopez2017-09-289-20/+20
| |/ / |/| |
* | | Backport part of c777bb91fd7 and 4074cb3b7c16 from EERémy Coutable2017-09-261-1/+1
|/ / | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Improve list of sorting optionsVitaliy @blackst0ne Klachkov2017-09-231-7/+20
| |
* | Workaround for n+1 in Projects::TreeController#show38171-workaroundAndrew Newdigate2017-09-221-1/+4
| | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/38261
* | Merge branch 'hide-frontmatter-help-page' into 'master'Robert Speicher2017-09-211-2/+8
|\ \ | | | | | | | | | | | | Do not show YAML frontmatter for doc pages under /help See merge request gitlab-org/gitlab-ce!14345
| * | Do not show YAML frontmatter for doc pages under /helpAchilleas Pipinellis2017-09-191-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We recently started adding YAML frontmatter in docs so that we can show more information, but that only works for the docs portal at docs.gitlab.com. For example, we want to add a last_updated entry https://gitlab.com/gitlab-org/gitlab-ce/issues/37677 Whereas this is useful for the docs portal, it looks ugly for docs under /help.
* | | Merge branch '20049-projects-api-forks' into 'master'Rémy Coutable2017-09-201-5/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Resolve "make project data via API report forks of this project" Closes #20049 See merge request gitlab-org/gitlab-ce!14355
| * | Employ ForkProjectsFinder in ForksControllerMark Fletcher2017-09-201-5/+3
| |/
* | Do not perform hard check (presence of file on storage)Kamil Trzcinski2017-09-191-1/+1
| | | | | | | | Instead perform soft check (the column set to indicate that file does exist)
* | Merge branch 'sh-stop-loading-issue-discussions' into 'master'Douwe Maan2017-09-191-3/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove unnecessary loading of discussions in `IssuesController#show` Closes #38034 See merge request gitlab-org/gitlab-ce!14351
| * | Remove unnecessary loading of discussions in `IssuesController#show`sh-stop-loading-issue-discussionsStan Hu2017-09-191-3/+0
| |/ | | | | | | | | | | | | | | Discussions are now done asynchronously via the `IssuesController#discussions` endpoint, so this should no longer be needed. This was taking 32% of the load time for GitLab CE issue 1. Closes #38034
* | Detect n+1 issues involving GitalyAndrew Newdigate2017-09-198-22/+57
|/
* Merge branch 'sh-optimize-discussion-json' into 'master'Yorick Peterse2017-09-181-2/+2
|\ | | | | | | | | | | | | Eliminate N+1 queries in loading discussions.json endpoint Closes #37955 See merge request gitlab-org/gitlab-ce!14327
| * Eliminate N+1 queries in loading discussions.json endpointsh-optimize-discussion-jsonStan Hu2017-09-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '37789-followup-for-read-registry-change' into 'master'Rémy Coutable2017-09-181-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Clean up read_registry scope changes Closes #37789 See merge request gitlab-org/gitlab-ce!14307
| * | Clean up read_registry scope changesRobin Bobbitt2017-09-181-1/+1
| | | | | | | | | | | | Closes #37789
* | | Merge branch 'fix-label-message' into 'master'Rémy Coutable2017-09-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix notification message when admin label was modified See merge request gitlab-org/gitlab-ce!14330
| * | | Fix notification message when admin label was modifiedfix-label-messageRobert Schilling2017-09-181-1/+1
| | |/ | |/|
* | | Merge branch '24121_extract_yet_another_users_finder' into 'master'Grzegorz Bizon2017-09-181-40/+7
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Extract AutocompleteController#users into finder Closes #24121 See merge request gitlab-org/gitlab-ce!13778
| * | move `find_users` method into finder and add `load_group` methodMaxim Rydkin2017-09-101-19/+7
| | |
| * | rename yet_another_users_finder into autocomplete_users_finderMaxim Rydkin2017-09-101-1/+1
| | |
| * | extract finder and add first testMaxim Rydkin2017-09-101-22/+1
| | |
* | | created services for keyshaseeb2017-09-154-8/+7
| | |
* | | Make the labels in the Compare form less confusing21331-improve-confusing-compare-pageRémy Coutable2017-09-151-1/+1
| |/ |/| | | | | | | | | | | | | | | * Improve the descriptive text * Rename "from" to "Target" and "to" to "Source" * Swap "Target" and "Source" to have the same order as in MRs * Reworded "Switch base of comparison" to "Swap versions" Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '34510-board-issues-sql-speedup' into 'master'Douwe Maan2017-09-141-4/+9
|\ \ | | | | | | | | | | | | | | | | | | 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-speedupmicael.bergeron2017-09-121-2/+2
| | | | | | | | | | | | added a QueryRecorder for IssuesController#index.json
| * | add association preloading for issue boardsmicael.bergeron2017-09-121-4/+9
| | |
* | | Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master'Grzegorz Bizon2017-09-132-6/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Move `lib/ci` to `lib/gitlab/ci`" Closes #5836 See merge request !14078
| * | | move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb`Maxim Rydkin2017-09-121-2/+2
| | | |
| * | | move `lib/ci/charts.rb` into `lib/gitlab/ci/charts.rb`Maxim Rydkin2017-09-121-4/+4
| |/ /
* | | Merge branch 'revert-2f46c3a8' into 'master'Robert Speicher2017-09-122-1/+3
|\ \ \ | |/ / |/| | | | | | | | Revert "Merge branch 'revert-f2421b2b' into 'master'" See merge request !14190
View Lorry Controller Status