summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update GIT_DEPTH wordingci-gitMark Pundsack2016-06-171-8/+26
|
* Clean up TOCMark Pundsack2016-06-171-23/+23
|
* Add to TOCMark Pundsack2016-06-171-0/+2
|
* Add GIT_STRATEGY and GIT_DEPTHMark Pundsack2016-06-171-0/+37
|
* Merge branch 'api-endpoints-award-emoji' into 'master' Robert Speicher2016-06-178-30/+722
|\ | | | | | | | | | | | | API endpoints for award emoji Closes #10884 See merge request !4575
| * fixup! updated docs for api endpoint award emojiZ.J. van de Weg2016-06-173-24/+188
| |
| * Add endpoints for award emoji on notesZ.J. van de Weg2016-06-174-74/+341
| | | | | | | | Docs also added.
| * Sort API endpoints and implement feedbackZ.J. van de Weg2016-06-175-35/+41
| |
| * Add endpoints for Award EmojiZ.J. van de Weg2016-06-175-1/+256
| | | | | | | | | | This only supports Issues and MergeRequests right now because of the consistency of the routes those models provide.
* | Merge branch 'commit-header' into 'master' Jacob Schatz2016-06-172-2/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes header vertical centering. Fixes header centering. ![ss__2016-05-16_at_5.26.30_PM](/uploads/300b64afc6585023f0e0dbbf721c359a/ss__2016-05-16_at_5.26.30_PM.png) cc @dzaporozhets See merge request !4170
| * | Fixed issue with dropdown buttonscommit-headerPhil Hughes2016-06-171-1/+1
| | |
| * | Use line-height instead of height.Jacob Schatz2016-06-172-3/+3
| | |
| * | Fixes header vertical centering.Jacob Schatz2016-06-171-0/+2
| | |
* | | Merge branch 'fix-todos-counters' into 'master' Robert Speicher2016-06-177-23/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure Todos counters doesn't count Todos for projects pending delete Use `TodosFinder` instead of `current_user.todos` to filter projects pending delete on Todos counters helpers. Counters should not reflect the number of Todos displayed on the tabs. Fixes #18633 See merge request !4663
| * | | Update CHANGELOGDouglas Barbosa Alexandre2016-06-171-0/+1
| | | |
| * | | Ensure Todos counters doesn't count Todos for projects pending deleteDouglas Barbosa Alexandre2016-06-176-23/+50
| | | |
* | | | Merge branch 'disable-saml-account-unlink' into 'master' Robert Speicher2016-06-174-4/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the unlink feature for SAML connected accounts (social login). This disables the ability to manually unlink your SAML account, if you have one connected. In certain scenarios, the only allowed login mechanism can be SAML, and if you unlink your account you will be locked out of the system (configuration dependent). Fixes #18613 See merge request !4662
| * | | | Added CHANGELOG item and fixed Rubocop errorsdisable-saml-account-unlinkPatricio Cano2016-06-142-4/+3
| | | | |
| * | | | Disable the unlink feature for SAML connected accounts (social login).Patricio Cano2016-06-143-4/+36
| | | | |
* | | | | Merge branch 'repo-check-require-push-events' into 'master' Robert Speicher2016-06-172-1/+34
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not check repos without push events Reduce false positives from automatic repository checks by skipping projects without push events. See merge request !4684
| * | | | Do not check repos without push eventsJacob Vosmaer2016-06-152-1/+34
| | | | |
* | | | | Merge branch '18034-cache-todo-counter' into 'master' Yorick Peterse2016-06-177-9/+91
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cache todo counters (pending/done) See merge request !4438
| * | | | | Cache todo counters (pending/done)18034-cache-todo-counterPaco Guzman2016-06-177-9/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - As todos are created/updated inside the TodoService we repopulate the cache just there for both pending/done todos - Todos as mark as done from the TodosController we update cache there too - All the added methods are kept in the User class for cohesion
* | | | | | Merge branch 'assignee-dropdown-selected' into 'master' Jacob Schatz2016-06-171-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with assignee dropdown not selecting correctly ## What does this MR do? Fixes an issue with assignee dropdown not selecting correctly. See merge request !4762
| * | | | | Fixed issue with assignee dropdown not selecting correctlyPhil Hughes2016-06-171-1/+1
|/ / / / /
* | | | | Merge branch 'clipboard-buttons-fix' into 'master' Robert Speicher2016-06-172-3/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix clipboard buttons on "Check out branch" modal. Closes #18794 See merge request !4760
| * | | | | Fix clibpoard buttons on "Check out branch" modal.clipboard-buttons-fixConnor Shea2016-06-172-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also document the clipboard_button_with_class method. Fixes #18794.
* | | | | | Merge branch 'clipboard-button-styling' into 'master' Robert Speicher2016-06-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed styling of clipboard button Closes #18773 See merge request !4728
| * | | | | | Fixed styling of clipboard buttonclipboard-button-stylingPhil Hughes2016-06-171-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '18745-fix' into 'master' Stan Hu2016-06-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a 'wrong number of arguments' error ## What does this MR do? Fixes #18745. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? To fix #18745. ## What are the relevant issue numbers? Fixes #18745. ## Does this MR meet the acceptance criteria? - [ ] Tests - [ ] All builds are passing - [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) See merge request !4757
| * | | | | | Fix a 'wrong number of arguments' errorRémy Coutable2016-06-171-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'track-total-method-call-time' into 'master' Robert Speicher2016-06-178-45/+198
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track method call times/counts as a single metric This changes method call tracking so only a single metric is emitted regardless of the number of calls. This allows us to more accurately measure the total execution time of a method as well as the number of times a method is called. See 851e3ff7578973c2206628424eac3b951a3c656d for more details. Method call tracking tracked calls individually meaning the end statistics may not always be accurate enough to get a good understanding of where time is spent. See merge request !4754
| * | | | | | Track method call times/counts as a single metricYorick Peterse2016-06-178-45/+198
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we'd create a separate Metric instance for every method call that would exceed the method call threshold. This is problematic because it doesn't provide us with information to accurately get the _total_ execution time of a particular method. For example, if the method "Foo#bar" was called 4 times with a runtime of ~10 milliseconds we'd end up with 4 different Metric instances. If we were to then get the average/95th percentile/etc of the timings this would be roughly 10 milliseconds. However, the _actual_ total time spent in this method would be around 40 milliseconds. To solve this problem we now create a single Metric instance per method. This Metric instance contains the _total_ real/CPU time and the call count for every instrumented method.
* | | | | | Merge branch 'sidekiq-api-metrics' into 'master' Achilleas Pipinellis2016-06-175-0/+284
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added API endpoint for Sidekiq Metrics. ## What does this MR do? It adds an API endpoint to gather metrics about Sidekiq, it's jobs, queues, and processes. ## Why was this MR needed? There was no API endpoint for Sidekiq information. ## What are the relevant issue numbers? Fixes #7171 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing See merge request !4653
| * | | | | Added missing mount point for Sidekiq Metrics API, after it got lost on rebase.Patricio Cano2016-06-171-0/+1
| | | | | |
| * | | | | Correct Sidekiq Metrics DocsPatricio Cano2016-06-171-0/+152
| | | | | |
| * | | | | Fixed Rubocop errorPatricio Cano2016-06-172-0/+130
| | | | | |
| * | | | | Added CHANGELOG item.Patricio Cano2016-06-171-0/+1
| | | | | |
* | | | | | Merge branch 'registry-500-fix' into 'master' Rémy Coutable2016-06-172-4/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly support application/json in Container Registry ## What does this MR do? When requesting tags a `application/json` is used by `docker/distribution`. ## Why was this MR needed? Fixes regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4669 ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18736 See merge request !4742
| * | | | | Use response_bodyKamil Trzcinski2016-06-171-6/+7
| | | | | |
| * | | | | Fix regression introduced by ↵registry-500-fixKamil Trzcinski2016-06-172-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4669 When requesting tags a `application/json` is used.
* | | | | | Merge branch 'fix-toggling-task-should-not-generate-todo' into 'master' Robert Speicher2016-06-172-19/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error when editing an issuable with a task list Closes #18712 See merge request !4751
| * | | | | | Fix error when editing an issuable with a task listfix-toggling-task-should-not-generate-todoDouglas Barbosa Alexandre2016-06-172-19/+40
| | | | | | |
* | | | | | | Merge branch 'secure-request-uris' into 'master' Yorick Peterse2016-06-173-1/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter out sensitive parameters of metrics data See merge request !4748
| * | | | | | | Filter out sensitive parameters of metrics dataPaco Guzman2016-06-173-1/+22
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'update-column-in-batches-where' into 'master' Robert Speicher2016-06-172-53/+80
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow customising of queries used for `update_column_in_batches` This MR makes two changes to `add_column_with_default` and `update_column_in_batches`: 1. `add_column_with_default` no longer wraps the entire set of updates in a single transaction, preventing any locks from sticking around for the duration of the entire transaction 2. `update_column_in_batches` now takes a block which can be used to customise the queries. This uses Arel as messing with raw SQL strings is a total pain In !4381 there's a need for updating existing rows/columns in a table in batches using a custom `WHERE` condition. Without the changes in this MR this would not be possible. See merge request !4680
| * | | | | | | Fix update_column_in_batches to update all rowsYorick Peterse2016-06-171-23/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes update_column_in_batches to ensure it always updates all rows now. These changes also allow for an extra SELECT query to be removed, nor does it use the row count for determining offsets and the likes; instead it's only used to determine the batch size.
| * | | | | | | Don't update columns in batches in a transactionYorick Peterse2016-06-152-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that whatever locks are acquired aren't held onto until the end of the transaction (= after _all_ rows have been updated). Timing wise there's also no difference between using a transaction and not using one.
| * | | | | | | Customizing of update_column_in_batches queriesYorick Peterse2016-06-152-41/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By passing a block to update_column_in_batches() one can now customize the queries executed. This in turn can be used to only update a specific set of rows instead of simply all the rows in the table.
* | | | | | | | Merge branch 'upgrade-ruby-tests-to-23' into 'master' Douwe Maan2016-06-171-43/+38
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Ruby 2.2 tests to 2.3 This changes the GitLab CI Tests that test compatibility with Ruby 2.2 to instead test compat with Ruby 2.3. We’ve discussed skipping straight to 2.3.0 when next upgrading the required Ruby version. Since Rails 5 requires 2.2.2, and we have to upgrade anyway, may as well do it now and not risk having to upgrade again come Rails 5.1 or 5.2. Test failures on Ruby 2.3 do not fail the build. Related: #12507, #12835 See merge request !3807