summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-unathorized-cloning' into 'security'Douwe Maan2016-11-095-12/+15
| | | | | | | | | | Ensure external users are not able to clone disabled repositories. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23788 See merge request !2017 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'issue_23548_dev' into 'master'Douwe Maan2016-11-092-22/+34
| | | | | | | | | | | | | | | | | | | | | disable markdown in comments when referencing disabled features fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23548 This MR prevents the following references when tool is disabled: - issues - snippets - commits - when repo is disabled - commit range - when repo is disabled - milestones This MR does not prevent references to repository files, since they are just markdown links and don't leak information. See merge request !2011 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '22481-honour-issue-visibility-for-groups' into 'security' Douwe Maan2016-11-094-25/+62
| | | | | | | | | Honour issue and merge request visibility in their respective finders This MR fixes a security issue with the IssuesFinder and MergeRequestFinder where they would return items the user did not have permission to see. This was most visible on the issue and merge requests page for a group containing projects that had set their issues or merge requests to "private". Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22481 See merge request !2000
* Merge branch '24146-add-focus-state' into 'master' Annabel Dunstone Gray2016-11-089-19/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24146 Add focus state to buttons and dropdowns ## What does this MR do? Adds focus state to buttons and dropdowns ## Are there points in the code the reviewer needs to double check? All focus states of buttons and dropdowns :) ## Why was this MR needed? Improve accessibility ## Screenshots (if relevant) Before: ![Screen_Shot_2016-11-07_at_4.30.31_PM](/uploads/8db2ac5e225c78495797180faf7bdb28/Screen_Shot_2016-11-07_at_4.30.31_PM.png) After: ![Screen_Shot_2016-11-07_at_4.30.16_PM](/uploads/4a81810cafe3063eef02b7bc87f8ce69/Screen_Shot_2016-11-07_at_4.30.16_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24146 See merge request !7347
| * 24146 Add focus state to buttons and dropdowns24146-add-focus-statetauriedavis2016-11-089-19/+5
| |
* | Merge branch 'improve-build-scroll-controls-responsive-behaviour' into 'master' Fatih Acet2016-11-085-79/+81
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved build page scroll UX ## What does this MR do? This MR smoothes the UX of the builds page by more effectively affixing the scroll step buttons. It also ensures the scroll step buttons are always in view, even if the sidemenu is open. It also moves the autoscroll button into the same container as the scroll buttons. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The build scroll buttons are always in unpredictable places and are often hidden behind sidemenus. ## Screenshots (if relevant) ![2016-09-08_17.43.58](/uploads/49cb9ad5ef2764453afaa405af7111b2/2016-09-08_17.43.58.gif) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Contributes #21832 See merge request !6270
| * | Add javascript unit tests for BuildJared Deckard2016-11-041-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Move comments to the correct location Remove array extension usage Move build options to fixture to match view
| * | Removed inline JS and added new affix declarationLuke Bennett2016-11-045-72/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tidied up UX Corrected naming convention issues with removing inline JS @deckar01 saves the day! Simplified `toggleSidebar` and `hideSidebar` Review changes Merge conflicts and update autoscroll button
* | | Merge branch 'upgrade-timeago' into 'master' Fatih Acet2016-11-0815-85/+312
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace jQuery.timeago with timeago.js ## What does this MR do? Replaces jQuery.timeago with [timeago.js](https://github.com/hustcc/timeago.js) ## Are there points in the code the reviewer needs to double check? * Check to make sure its working everywhere :smile: * Check to make sure the timeago wording matches what we have now (I think I've got this down but an extra pair of :eyes: would help too) ## Why was this MR needed? * The jQuery.timeago version we have is outdated * timeago.js is smaller (7.19 KB => 4.52 KB) * timeago.js has no jQuery dependency * removes all inline javascript :crossed_swords: for timeago ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21793 See merge request !6274
| * | | Replace jQuery.timeago with timeago.jsClement Ho2016-11-0715-85/+312
| | |/ | |/|
* | | Merge branch 'rs-project_params' into 'master' Rémy Coutable2016-11-081-17/+35
|\ \ \ | | | | | | | | | | | | | | | | Apply `*_params_ce` pattern to ProjectsController See merge request !7338
| * | | Apply `*_params_ce` pattern to ProjectsControllerrs-project_paramsRobert Speicher2016-11-071-17/+35
| | | |
* | | | Merge branch 'fix-uncheckable-label-for-force_remove_source_branch' into ↵Robert Speicher2016-11-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Clicking "force remove source branch" label now toggles the checkbox again We remove the ID from the hidden tag for `merge_request[force_remove_source_branch]` in order to fix the checkbox toggling when the associated label is clicked. The issue was introduced by !7267 and discovered in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7267#note_18028311. See merge request !7356
| * | | | Clicking "force remove source branch" label now toggles the checkbox againfix-uncheckable-label-for-force_remove_source_branchRémy Coutable2016-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'faster_project_search' into 'master' Sean McGivern2016-11-081-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Faster search inside Project See merge request !7353
| * | | | | Faster searchfaster_project_searchValery Sizov2016-11-081-0/+4
| |/ / / /
* | | | | Merge branch '24255-search-fix' into 'master' Rémy Coutable2016-11-082-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken commits search ## What does this MR do? Fixes commits search ## What are the relevant issue numbers? Closes #24255 See merge request !7339
| * | | | Fix broken commits search24255-search-fixValery Sizov2016-11-082-2/+2
| | |/ / | |/| |
* | | | Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan2016-11-0810-28/+106
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use separate email-friendly token for incoming email See merge request !5914
| * | | | implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-079-32/+84
| | | | | | | | | | | | | | | | | | | | reactivates all tests and writes more tests for it
| * | | | Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-075-26/+52
| | | | | | | | | | | | | | | | | | | | email token be reset
* | | | | Merge branch 'todos-filter-empty-state' into 'master' Sean McGivern2016-11-082-9/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed todos empty state when filtering Closes #24127 See merge request !7334
| * | | | | Changed helper method to check for none on paramsPhil Hughes2016-11-082-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Moved if statements around in view
| * | | | | Fixed todos empty state when filteringtodos-filter-empty-statePhil Hughes2016-11-072-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | Closes #24127
* | | | | | Merge branch 'dz-fix-project-index' into 'master' Sean McGivern2016-11-081-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project index page See merge request !7331
| * | | | | | Fix project indexDmitriy Zaporozhets2016-11-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'fix-404-on-network-when-entering-a-nonexistent-git-revision' ↵Sean McGivern2016-11-083-3/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Network page appear with an error message when entering nonexistent git revision Closes #2362 See merge request !7172
| * | | | | | | Refactor method nameHiroyuki Sato2016-11-081-2/+2
| | | | | | | |
| * | | | | | | Fix bug of json request urlHiroyuki Sato2016-11-072-4/+11
| | | | | | | |
| * | | | | | | Remove 'extended_sha1' option from ExtractsPath moduleHiroyuki Sato2016-11-062-1/+2
| | | | | | | |
| * | | | | | | Separete a very long lineHiroyuki Sato2016-11-061-1/+3
| | | | | | | |
| * | | | | | | Network page appear with an error message when entering nonexistent git revisionHiroyuki Sato2016-11-063-3/+8
| | |_|/ / / / | |/| | | | |
* | | | | | | 17492 Update link color for more accessible contrast17492-link-contrasttauriedavis2016-11-074-16/+16
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch '21664-incorrect-workhorse-version-number-displayed' into 'master' Rémy Coutable2016-11-072-1/+10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the Gitlab Workhorse HTTP header in the admin dashboard Fixes issue #21664 where the GitLab Workhorse version displayed within the Admin Area was not correct for installations from source. See merge request !7332
| * | | | | Use the Gitlab Workhorse HTTP header in the admin dashboard21664-incorrect-workhorse-version-number-displayedChris Wright2016-11-072-1/+10
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'process-commits-using-sidekiq' into 'master' Robert Speicher2016-11-079-42/+152
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Processing Commits Using Sidekiq This moves the code of `GitPushService#process_commit_messages` into a separate Sidekiq worker. This allows processing of commits to happen in parallel, speeding up the process. See the individual commit (messages) for more information. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/15463 See merge request !6802
| * | | | Process commits in a separate workerprocess-commits-using-sidekiqYorick Peterse2016-11-075-35/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the code used for processing commits from GitPushService to its own Sidekiq worker: ProcessCommitWorker. Using a Sidekiq worker allows us to process multiple commits in parallel. This in turn will lead to issues being closed faster and cross references being created faster. Furthermore by isolating this code into a separate class it's easier to test and maintain the code. The new worker also ensures it can efficiently check which issues can be closed, without having to run numerous SQL queries for every issue.
| * | | | Added IssueCollectionYorick Peterse2016-11-074-8/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class can be used to reduce a list of issues down to a subset based on user permissions. This class operates in such a way that it can reduce issues using as few queries as possible, if any at all.
| * | | | Add the method ExternalIssue#project_idYorick Peterse2016-11-071-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | This method returns the project's ID, making ExternalIssue slightly more compatible with Issue (which also defines the "project_id" method).
| * | | | Add User#projects_with_reporter_access_limited_toYorick Peterse2016-11-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method can be used to retrieve a list of projects for a user that said user has reporter access to. This list is then be reduced down to a specific set of projects. This allows you to reduce a list of projects to a list of projects you have reporter access to in an efficient manner.
* | | | | Merge branch 'jacobvosmaer-gitlab/gitlab-ce-git-gc-improvements' into 'master' Douwe Maan2016-11-075-11/+156
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use more than one kind of Git garbage collection Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6588 by @jacobvosmaer to get the builds to pass :) Closes #22729 See merge request !7321
| * | | | Refine Git garbage collectionJacob Vosmaer2016-11-045-11/+156
| | | | |
* | | | | Merge branch '24059-post-facto-fixups' into 'master' Douwe Maan2016-11-071-5/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixups to "Round-robin repository storage" ## What does this MR do? * Simplifies a method in application_settings.rb * Correctly marks a migration as needing downtime * Documents the requirement for renamed columns to be ## Are there points in the code the reviewer needs to double check? Should any of these changes be split out? Ideally we'd get this into the same point release as !7273 ## Why was this MR needed? Post-facto review of !7273 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [X] API support added - Tests - [X] Added for this feature/bug - [x] All builds are passing - [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [X] Branch has no merge conflicts with `master` (if it does - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Related to #24059 /cc @yorickpeterse @rspeicher See merge request !7287
| * | | | Simplify ApplicationSetting#repository_storagesNick Thomas2016-11-071-5/+1
| | | | |
* | | | | Merge branch 'refactor-issuable-form-template_selector' into 'master' Robert Speicher2016-11-074-44/+68
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor template selector in issuable form CE brother of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/844 See merge request !7249
| * | | | | Refactor template selector in issuable formrefactor-issuable-form-template_selectorRémy Coutable2016-11-044-44/+68
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Use method helper instead of add_template_helperbogdanvlviv2016-11-062-8/+8
| |_|_|/ / |/| | | |
* | | | | Merge branch 'remove-wiki-image-border-radius' into 'master' Fatih Acet2016-11-0411-15/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update avatar container name so it doesnt conflict with other image containers Bug from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7206 renders all wiki images circular Before: ![Screen_Shot_2016-11-03_at_9.27.45_AM](/uploads/f49baa4481cec6d6c043087aa1a83d09/Screen_Shot_2016-11-03_at_9.27.45_AM.png) After: ![Screen_Shot_2016-11-03_at_9.27.37_AM](/uploads/5b21d1752b5fa5adcabd44b8973fb55d/Screen_Shot_2016-11-03_at_9.27.37_AM.png) cc @tauriedavis @dzaporozhets See merge request !7268
| * | | | | Update avatar container name so it doesnt conflict with other image containersremove-wiki-image-border-radiusAnnabel Dunstone Gray2016-11-0311-15/+15
| | | | | |
* | | | | | Merge branch 'add-matches-and-closest-element-extensions' into 'master' Fatih Acet2016-11-041-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Element extension with .matches and .closest ## What does this MR do? This adds `.matches` and `.closest` polyfills that will help when removing/not using jQuery. I added these in another MR which was then refactored to not require these methods, but I thought we might as well not lose the code. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Help when removing/not using jQuery. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !6946