summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Improve cyclomatic of ability::allowedKamil Trzcinski2016-06-151-15/+1
| | | | | | | | | | |
| * | | | | | | | | | Improve forms and specsKamil Trzcinski2016-06-156-20/+22
| | | | | | | | | | |
| * | | | | | | | | | Improve validationsKamil Trzcinski2016-06-156-34/+31
| | | | | | | | | | |
| * | | | | | | | | | Improve design after reviewKamil Trzcinski2016-06-1414-69/+59
| | | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-1439-543/+1040
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | | | Update scss to make the views look nicerKamil Trzcinski2016-06-145-9/+13
| | | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-1424-108/+817
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # lib/ci/gitlab_ci_yaml_processor.rb
| * | | | | | | | | | | | Test environment controller specsKamil Trzcinski2016-06-143-1/+168
| | | | | | | | | | | | |
| * | | | | | | | | | | | Properly create a new deployment after build successKamil Trzcinski2016-06-142-6/+68
| | | | | | | | | | | | |
| * | | | | | | | | | | | Authorize environments controller actionsKamil Trzcinski2016-06-144-2/+48
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add gitlab-ci.yml documentation for environmentsKamil Trzcinski2016-06-141-0/+27
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add specs for models and servicesKamil Trzcinski2016-06-1412-28/+139
| | | | | | | | | | | | |
| * | | | | | | | | | | | Validate environment name with regexKamil Trzcinski2016-06-144-10/+78
| | | | | | | | | | | | |
| * | | | | | | | | | | | Make retry action on pipeline to save a userKamil Trzcinski2016-06-142-3/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-14109-647/+1420
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Improved viewsPhil Hughes2016-06-134-46/+44
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add deployment viewsKamil Trzcinski2016-06-119-33/+74
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Added initial version of deploymentsKamil Trzcinski2016-06-1022-111/+311
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | commit statusKamil Trzcinski2016-06-108-0/+138
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'seed-fu-award-emoji' into 'master' Douwe Maan2016-06-152-0/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seed Award Emoji while seeding the database ## What does this MR do? Lets `rake dev:setup` create award emoji on _some_ awardables. Seemed overkill to give all that privilege. See merge request !4555
| * | | | | | | | | | | | | Random selection now also works for MySQLseed-fu-award-emojiZ.J. van de Weg2016-06-152-3/+7
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Near half of the Issues get Award Emoji when seedingZ.J. van de Weg2016-06-151-4/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Skip system notes from receiving award emojiZ.J. van de Weg2016-06-151-4/+10
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Seed Award Emoji while seeding the databaseZ.J. van de Weg2016-06-151-0/+27
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix-header-logo-link' into 'master' Jacob Schatz2016-06-152-7/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the logo in header not being an anchor link. ## What does this MR do? Adds an actual link to the Tanuki in the header instead of a `Turbolinks.visit()`. ## Are there points in the code the reviewer needs to double check? Do we care that this reverts the Safari issue fixed in !2690? I feel bad, but it's hacky and there's not a great way to fix it here. ## Why was this MR needed? You couldn't open the home page in a new tab before, it was very annoying. ## What are the relevant issue numbers? Fixes #18604 cc: @rspeicher See merge request !4661
| * | | | | | | | | | | | Fix #18604, logo in header wasn't an anchor link.fix-header-logo-linkConnor Shea2016-06-142-7/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'project-move-dropdown-search' into 'master' Jacob Schatz2016-06-153-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with move dropdown not being searchable ## What does this MR do? Adds the ability to search the project move dropdown. ## What are the relevant issue numbers? Closes #18634 ## Screenshots (if relevant) ![search](/uploads/f10a9a16b608308c1b3c66f186f57f80/search.gif) See merge request !4666
| * | | | | | | | | | | | Added test to dropdown searchPhil Hughes2016-06-151-0/+16
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed issue with move dropdown not being searchableproject-move-dropdown-searchPhil Hughes2016-06-152-0/+5
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #18634
* | | | | | | | | | | | Merge branch '17333-u2f-only-after-authenticator' into 'master' Douwe Maan2016-06-154-43/+40
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow U2F set up unless an authenticator app is set up Closes #17333 # TODO - [ ] #17333 Authenticator should be set up before enabling U2F - [x] Implementation - [x] Fix/add tests - [x] Refactor - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/964c98a3c427cac6e3de88ddc74a9f172ee9742d/builds) to pass - [x] Assign to endboss for review - [x] Address @DouweM's comments - [x] No need for `javascript:void(0)` - [x] Add screenshots - [ ] Wait for merge # Screenshots ![Screen_Shot_2016-06-15_at_8.18.03_AM](/uploads/26531fa7f6e5d7617fd11d1779021b4f/Screen_Shot_2016-06-15_at_8.18.03_AM.png) ![Screen_Shot_2016-06-15_at_8.18.37_AM](/uploads/ceaae97a987a15d3e04dd76aa8a944bd/Screen_Shot_2016-06-15_at_8.18.37_AM.png) ![Screen_Shot_2016-06-15_at_8.18.47_AM](/uploads/394224d5fcff759d5acc3bf39a138530/Screen_Shot_2016-06-15_at_8.18.47_AM.png) See merge request !4585
| * | | | | | | | | | | | Fix teaspoon spec.17333-u2f-only-after-authenticatorTimothy Andrew2016-06-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We added a `current_user.two_factor_via_otp?` check to the view. When rendering the view via the teaspoon fixture, `current_user` is `nil`.
| * | | | | | | | | | | | Update `u2f_spec` to cover U2F being disabled until authenticator is set up.Timothy Andrew2016-06-151-34/+23
| | | | | | | | | | | | |
| * | | | | | | | | | | | Don't allow clicking on "Setup New U2F Device" unless an authenticator app ↵Timothy Andrew2016-06-152-8/+15
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has been set up. - Also change the help message to indicate that an authenticator app is now a prerequisite for U2F.
* | | | | | | | | | | | Merge branch '18451-track-new-redis-connections' into 'master' Douwe Maan2016-06-153-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Track the number of new Redis connections per transaction" ## What does this MR do? Add a new metric counter, `new_redis_connections`, that contains the number of calls to `Redis::Client#connect` in the current transaction. ## Are there points in the code the reviewer needs to double check? Not sure. I tested this in kind of a brute-force way: 1. Add a debugger in the monkey-patched `connect` method. 2. With metrics enabled, start the app and load a page. 3. The first Redis connection is created by `Rack::Attack` and isn't in a transaction, but still works fine. 4. The second Redis connection is within a transaction (the page load), and increments the counter. 5. If I reload the page, neither debugger is hit. 6. If I use a Redis client and do `CLIENT KILL` on my two existing clients, then reload the page, I get 3 and 4 again. 7. If I disable metrics collection, the debugger never gets hit. ## Why was this MR needed? We may have a Redis connection leak somewhere, so adding metrics will let us track this. ## What are the relevant issue numbers? Closes #18451. ## Screenshots (if relevant) Hahaha nope, not 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc @yorickpeterse See merge request !4649
| * | | | | | | | | | | | Fix spec description typo18451-track-new-redis-connectionsSean McGivern2016-06-141-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Track new Redis connectionsSean McGivern2016-06-142-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increment the counter `new_redis_connections` on each call to `Redis::Client#connect`, if we're in a transaction.
* | | | | | | | | | | | | Merge branch 'doc/issue-move-assigns-labels-and-milestone' into 'master' Achilleas Pipinellis2016-06-151-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for assigning labels/milestone when moving issue Extends https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3934 See merge request !4069
| * | | | | | | | | | | | | Add docs for assigning labels/milestone when moving issueGrzegorz Bizon2016-06-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | Merge branch 'ci-build-token' into 'master' Achilleas Pipinellis2016-06-151-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document CI_BUILD_TOKEN ## What does this MR do? Adds `CI_BUILD_TOKEN` to CI variables documentation. See merge request !4664
| * | | | | | | | | | | | | | Document CI_BUILD_TOKENci-build-tokenMark Pundsack2016-06-141-0/+2
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '14320-note-grouped_awards' into 'master' Yorick Peterse2016-06-152-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include user relationship when retrieving award_emoji See merge request !4647
| * | | | | | | | | | | | | Include user relationship when retrieving award_emoji14320-note-grouped_awardsPaco Guzman2016-06-152-2/+7
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoiding N+1 when showing grouped awards and when calculating participants for awardable entities
* | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-15126-754/+2385
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'dont-drop-stuck-builds' into 'master' Stan Hu2016-06-153-4/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't fail builds for projects that are deleted when they are stuck ## What does this MR do? Solves when dropping stuck connection. ``` Dropping stuck pending build 1545510 for runner NoMethodError: undefined method `origin_merge_requests' for nil:NilClass from /opt/gitlab/embedded/service/gitlab-rails/app/services/merge_requests/base_service.rb:50:in `merge_request_from' from /opt/gitlab/embedded/service/gitlab-rails/app/services/merge_requests/base_service.rb:57:in `each_merge_request' from /opt/gitlab/embedded/service/gitlab-rails/app/services/merge_requests/add_todo_when_build_fails_service.rb:5:in `execute' from /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/metrics/instrumentation.rb:164:in `execute' from /opt/gitlab/embedded/service/gitlab-rails/app/models/commit_status.rb:51:in `block (2 levels) in <class:CommitStatus>' from /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/state_machines-0.4.0/lib/state_machines/eval_helpers.rb:79:in `call' ... ``` This happens, because that `default_scope` of `Projects` filters returns the projects that are not deleted, where `Ci::Build` doesn't take into account. See merge request !4609
| | * | | | | | | | | | | | Don't fail builds for projects that are deleted when they are stuckdont-drop-stuck-buildsKamil Trzcinski2016-06-123-4/+18
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'fix-sidekiq-troubleshooting' into 'master' Stan Hu2016-06-141-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in obtaining a backtrace from all threads in gdb See merge request !4612
| | * | | | | | | | | | | | | Fix typo in obtaining a backtrace from all threads in gdbStan Hu2016-06-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add command to turn off pagination [ci skip]
| * | | | | | | | | | | | | | Merge branch 'rs-fix-note-polling' into 'master' Jacob Schatz2016-06-142-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix note polling when a window has been hidden `refresh` was called, `refreshing` was set to true, but then because `document.hidden` was true, `getContent` was never called, and `refreshing` never got reset to `false`, which stopped polling entirely until refresh. See merge request !4635
| | * | | | | | | | | | | | | | Fix note polling when a window has been hiddenrs-fix-note-pollingRobert Speicher2016-06-132-2/+6
| | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `refresh` was called, `refreshing` was set to true, but then because `document.hidden` was true, `getContent` was never called, and `refreshing` never got reset to `false`, which stopped polling entirely until refresh.
| * | | | | | | | | | | | | | Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu2016-06-1414-14/+169
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually create todo for issuable ## What does this MR do? Adds a button to the sidebar in issues & merge requests to allow users to manually create a todo item themselves. ## What are the relevant issue numbers? Closes #15045 ## Screenshots (if relevant) ![Screen_Shot_2016-06-07_at_09.52.14](/uploads/00af70244c0589d19f241c3e85f3d63d/Screen_Shot_2016-06-07_at_09.52.14.png) ![Screen_Shot_2016-06-07_at_09.52.06](/uploads/e232b02208613a4a50cff4d1e6f119ff/Screen_Shot_2016-06-07_at_09.52.06.png) ![Screen_Shot_2016-06-07_at_09.51.14](/uploads/f1d36435d49ab882538ae2252bec8086/Screen_Shot_2016-06-07_at_09.51.14.png) See merge request !4502