summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
* Cleaning up navigational order - ProjectKushal Pandya2017-03-028-34/+23
|
* Merge branch '25437-just-emoji' into 'master'Sean McGivern2017-03-012-1/+5
|\ | | | | | | | | | | | | #25437 Allow posting of just an emoji in comment; add /award slash command Closes #25437 See merge request !9382
| * add /award slash commandmhasbini2017-02-282-1/+5
| | | | | | | | add /award slash command; Allow posting of just an emoji in comment
* | Merge branch '27354-navigation-new-button' into 'master' Dmitriy Zaporozhets2017-02-281-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Put back the new project button Closes #27354 See merge request !9426
| * | Put back the new project button27354-navigation-new-buttonAnnabel Dunstone Gray2017-02-221-0/+1
| | |
* | | Merge branch '1937-https-clone-url-username' into 'master' Rémy Coutable2017-02-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add the username of the current user to the HTTP(S) clone URL Closes #1937 See merge request !9347
| * | | Add the username of the current user to the HTTP(S) clone URLJan Christophersen2017-02-241-1/+1
| | |/ | |/|
* | | Merge branch 'remove-jquery-ui-plugins' into 'master' Jacob Schatz2017-02-242-19/+13
|\ \ \ | |/ / |/| | | | | | | | Removed jQuery UI highlight & autocomplete See merge request !8420
| * | Removed jQuery UI highlight & autocompleteremove-jquery-ui-pluginsPhil Hughes2017-02-092-19/+13
| | | | | | | | | | | | In an effort to tackle #18437 this removes 2 of the jQuery UI plugins. Highlight & autocomplete, both used once in our code. Highlight was just removed easily, autocomplete was replaced with GL dropdown
* | | Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-231-1/+1
| | | | | | | | | | | | This reverts commit 96bef54154e669f9a3e92c3a4bc76c0be3a52e48.
* | | Enable Style/WordArrayDouwe Maan2017-02-231-1/+1
| | |
* | | Enable Style/BarePercentLiteralsDouwe Maan2017-02-231-1/+1
| | |
* | | Enable Performance/RedundantMergeDouwe Maan2017-02-231-1/+1
| | |
* | | Code style improvementsAlfredo Sumaran2017-02-231-3/+1
| |/ |/|
* | Add filtered search to MR pageadd-filtered-search-to-mrClement Ho2017-02-211-7/+0
| |
* | Fix Spinach failurefix-spinach-failureDouwe Maan2017-02-201-0/+1
| |
* | Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master' Clement Ho2017-02-181-9/+14
|\ \ | | | | | | | | | | | | | | | | | | Todo done clicking is kind of unusable. Closes #25465 See merge request !8691
| * | Todo done clicking is kind of unusable.Jacopo2017-02-171-9/+14
| | | | | | | | | | | | | | | | | | The Done button will change to an Undo button and the line item will be greyed out. Bold links will be unbolded. The user can undo the task by clicking the Undo button.
* | | Merge branch 'fix/gb/pipeline-retry-builds-started' into 'master' Kamil Trzciński2017-02-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make pipeline retry take stages order into account Closes #27431, #23710, and #26551 See merge request !9021
| * \ \ Merge branch 'master' into fix/gb/pipeline-retry-builds-startedGrzegorz Bizon2017-02-172-47/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (313 commits) Allow slashes in slash command arguments Add API endpoint to get all milestone merge requests remove trailing comma Restore pagination to admin abuse reports replace deprecated NoErrorsPlugin with NoEmitOnErrorsPlugin only compress assets in production Reduce number of pipelines created to test pagination add CHANGELOG.md entry for !8761 prevent diff unfolding link from appearing for deleted files fix build failures only show diff unfolding link if there are more lines to show fix typo in node section Only yield valid references in ReferenceFilter.references_in Cache js selectors; fix css move "Install node modules" step before "Migrate DB" within update process Renders pagination again for pipelines table update migration docs for 8.17 to include minimum node version Add CHANGELOG file Fix positioning of top scroll button Remove comments in migration ...
| * | | | Make build clone/retry implementation more robustfix/gb/pipeline-retry-builds-startedGrzegorz Bizon2017-02-161-1/+1
| | |/ / | |/| |
* | | | Merge branch 'move-spinach-dashboard-issues-test-to-rspec' into 'master'Rémy Coutable2017-02-172-112/+0
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Move dashboard issues spinach test to Rspec See merge request !8955
| * | | Move dashboard issues spinach test to RspecSemyon Pupkov2017-02-102-112/+0
| |/ / | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | Delete labels spinach test bc covered by rspecAnnabel Dunstone Gray2017-02-152-47/+0
|/ /
* | Merge branch 'move-user-snippets-spinach-test-to-rspec' into 'master'Rémy Coutable2017-02-092-89/+0
|\ \ | |/ |/| | | | | Move 'User Snippets' Spinach feature to Rspec See merge request !8574
| * Move 'User Snippets' Spinach feature to Rspecthe-undefined2017-01-162-89/+0
| | | | | | | | | | | | | | | | This commit moves the `snippets/user.feature` Spinach test to a Rspec feature, as part of deprecating the Spinach test suite. - Remove Spinach discover snippets feature and steps - Add Rspec feature test
* | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-061-0/+3
|\ \ | | | | | | | | | # Conflicts: # db/schema.rb
| * \ Merge branch '25624-anticipate-obstacles-to-removing-turbolinks' into 'master' Jacob Schatz2017-02-031-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove Turbolinks Closes #25624 See merge request !8570
| | * | Find .merge-request instead of sleep in MR search spec.25624-anticipate-obstacles-to-removing-turbolinksBryce Johnson2017-02-021-1/+3
| | | |
| | * | Remove turbolinks.Bryce Johnson2017-02-021-0/+1
| | | |
* | | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-035-34/+6
|\ \ \ \ | |/ / /
| * | | Fix broken tests17662-rename-buildsFilipa Lacerda2017-02-033-6/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Build to Job Replace "Builds" by "Jobs" and fix broken specs Replace "Builds" by "Jobs" Fix broken spinach test Fix broken test Remove `˙` at the beginning of the file Fix broken spinach test Fix broken tests Changes after review
| * | Move Dashboard shortcuts specs from Spinah to RSpecmove-dashboard-shortcuts-from-spinach-to-rspecRémy Coutable2017-01-312-28/+0
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Project#ensure_pipeline changed the args orderLin Jen-Shin2017-01-311-1/+1
| | |
* | | Fix EE specs after ci_commit rename to pipelineKamil Trzcinski2017-01-311-6/+6
| | |
* | | Fix adding pages domain to projects in groupsKamil Trzcinski2017-01-312-0/+15
| | |
* | | Fix broken feature testsKamil Trzcinski2017-01-311-1/+1
| | |
* | | Update commentsKamil Trzcinski2017-01-311-1/+1
| | |
* | | Final fixesKamil Trzcinski2017-01-311-11/+11
| | |
* | | Split PagesController into PagesController and PagesDomainsControllerKamil Trzcinski2017-01-311-1/+1
| | | | | | | | | | | | | | | 1. PagesController is used to show all domains and general overview of Pages 2. PagesDomainsController is used to manage pages domains
* | | Added spinach testsKamil Trzcinski2017-01-312-0/+212
| | |
* | | Add tests for Active TabKamil Trzcinski2017-01-312-0/+15
|/ /
* | Added labels empty state and priority label empty state20852-getting-started-project-better-blank-state-for-labels-viewLuke "Jared" Bennett2017-01-301-5/+4
| | | | | | | | | | | | Fixed delete labels not working Review changes
* | Present TODO's list without grouping by projectOswaldo Ferreira2017-01-271-18/+27
| |
* | Merge branch 'rs-empty_project-for-associations' into 'master' Rémy Coutable2017-01-261-4/+3
|\ \ | | | | | | | | | | | | Factories with a project association use `:empty_project` by default See merge request !8770
| * | Use a project factory with a repository where necessaryrs-empty_project-for-associationsRobert Speicher2017-01-251-4/+3
| | |
* | | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-251-2/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two cases that could be problematic: 1. Because sometimes AuthorizedProjectsWorker would be scheduled in a transaction it was possible for a job to run/complete before a COMMIT; resulting in it either producing an error, or producing no new data. 2. When scheduling jobs the code would not wait until completion. This could lead to a user creating a project and then immediately trying to push to it. Usually this will work fine, but given enough load it might take a few seconds before a user has access. The first one is problematic, the second one is mostly just annoying (but annoying enough to warrant a solution). This commit changes two things to deal with this: 1. Sidekiq scheduling now takes places after a COMMIT, this is ensured by scheduling using Rails' after_commit hook instead of doing so in an arbitrary method. 2. When scheduling jobs the calling thread now waits for all jobs to complete. Solution 2 requires tracking of job completions. Sidekiq provides a way to find a job by its ID, but this involves scanning over the entire queue; something that is very in-efficient for large queues. As such a more efficient solution is necessary. There are two main Gems that can do this in a more efficient manner: * sidekiq-status * sidekiq_status No, this is not a joke. Both Gems do a similar thing (but slightly different), and the only difference in their name is a dash vs an underscore. Both Gems however provide far more than just checking if a job has been completed, and both have their problems. sidekiq-status does not appear to be actively maintained, with the last release being in 2015. It also has some issues during testing as API calls are not stubbed in any way. sidekiq_status on the other hand does not appear to be very popular, and introduces a similar amount of code. Because of this I opted to write a simple home grown solution. After all, all we need is storing a job ID somewhere so we can efficiently look it up; we don't need extra web UIs (as provided by sidekiq-status) or complex APIs to update progress, etc. This is where Gitlab::SidekiqStatus comes in handy. This namespace contains some code used for tracking, removing, and looking up job IDs; all without having to scan over an entire queue. Data is removed explicitly, but also expires automatically just in case. Using this API we can now schedule jobs in a fork-join like manner: we schedule the jobs in Sidekiq, process them in parallel, then wait for completion. By using Sidekiq we can leverage all the benefits such as being able to scale across multiple cores and hosts, retrying failed jobs, etc. The one downside is that we need to make sure we can deal with unexpected increases in job processing timings. To deal with this the class Gitlab::JobWaiter (used for waiting for jobs to complete) will only wait a number of seconds (30 by default). Once this timeout is reached it will simply return. For GitLab.com almost all AuthorizedProjectWorker jobs complete in seconds, only very rarely do we spike to job timings of around a minute. These in turn seem to be the result of external factors (e.g. deploys), in which case a user is most likely not able to use the system anyway. In short, this new solution should ensure that jobs are processed properly and that in almost all cases a user has access to their resources whenever they need to have access.
* | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable2017-01-205-12/+12
|\ \ | | | | | | | | | | | | Moved the webhooks and services gear options to a single one called integrations See merge request !8380
| * | Fixed more testsJose Ivan Vargas2017-01-182-7/+7
| | |
| * | Fixed spinach feature tests for the services and hooks controllersJose Ivan Vargas2017-01-183-5/+5
| | | | | | | | | | | | Added a test for the integrations controller