summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 'api-remove-owned-groups'api-remove-owned-groupsSean McGivern2017-02-247-4/+24
|\ | | | | | | # Conflicts: # doc/api/v3_to_v4.md
| * Merge branch '3874-correctly-return-json-on-delete-responses' into 'master' Sean McGivern2017-02-244-1/+14
| |\ | | | | | | | | | | | | | | | | | | Return 202 with JSON body on async removals on V4 API Closes #3874 See merge request !9449
| | * Return 202 with JSON body on async removals on V4 API3874-correctly-return-json-on-delete-responsesOswaldo2017-02-234-1/+14
| | |
| * | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-02-24136-517/+1218
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27762-add-default-artifacts-expiration * upstream/master: (247 commits) Switched CONTRIBUTING.md style guide recommendation for method chaining Fix new offenses Stylistic tweaks Fix OAuth/SAML user blocking behavior Revert "Enable Style/DotPosition" Revert "Prefer leading style for Style/DotPosition" Revert "Enable Style/BarePercentLiterals" Manually correct autocorrect Move up delegate calls Exclude migrations from Style/MutableConstant ActiveSupport delegation is preferred over Forwardable Update haml_lint to work with newest rubocop Add explanations to cops Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml Order cops alphabetically Don’t exclude some file in lib from rubocop Fix new offenses Enable Rails/Delegate Enable Style/WordArray ...
| * | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-02-217-47/+93
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27762-add-default-artifacts-expiration * upstream/master: (26 commits) Allow searching issues for strings containing colons Fix Spinach failure [ci skip] UX Guide: Add personas Reuse User#find_by_any_email on UserFormatter#find_by_email Use leading periods on UserFormatter#find_by_external_uid Add CHANGELOG entry Add a simple cache for Gitlab::GithubImport::Client#user GitHub Importer - Find users based on their email address Don't use potentially slow ForkService in spec Added support for Authentiq Back-Channel Logout Added documentation for permalinks to most recent build artifacts Unify issues search behavior by always filtering when ALL labels matches Update GitLab Pages to v0.3.1 Document Timecop usage for time-sensitive tests Add process for requesting approval for licenses Rename karma job to rake karma Update positioning of nav scroll arrows Fix issue where files on a fork could not be edited Move tanuki to left of title; increase max-width of title Refactor project stats & last_commit CSS; left align main nav items ...
| * \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-02-2152-235/+536
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27762-add-default-artifacts-expiration * upstream/master: (234 commits) Improve performance of User Agent Detail Fix some grammar in the API docs Remove shared example for pagination API: Use POST to (un)block a user API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar` Use grape validation for dates Change wording for LDAP doc that was moved to a new location API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable` Download snippets with LF line-endings by default utilize pre-minified Vue in production since no CJS distribution is available Prevent project team from being truncated too early during project destruction loading icon sometimes toggled alongside MR pipeline contents fix failed spec because haml_lint fix incorrect sidekiq concurrency count in admin background page exclude rpc_pipefs from system disc info Fix wrong line ending [ci-skip] fix overlooked window binding in spec files remove imports loader replace implicit this == window with explicit binding Todo done clicking is kind of unusable. ...
| * \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-02-1612-30/+51
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27762-add-default-artifacts-expiration * upstream/master: (37 commits) Show merge errors in merge request widget Clarify that stage is needed to stop environments Fix broken link in university docs allow clicking on text or icon to trigger expand style links on system notes to look clickable Clean up terms used for issues. Use New instead of Add. Fix most of broken docs links Set `Auto-Submitted: auto-generated` header to emails Fix Rubocop offense Fix regression where cmd-click stopped working for todos and merge request tabs Remove changelog entries for 8.16.5 release Merge branch 'fix-github-import-MR-wrong-project' into 'security' Merge branch 'svg-xss-fix' into 'security' Merge branch 'fix-rdoc-xss' into 'security' Merge branch 'asciidoctor-xss-patch' into 'security' Specify that only project owners can transfer a project only load istanbul plugin in development mode Make Karma output look nicer for CI (!9165) Centers loading icon vertically and horizontally in pipelines table in commit view Rename builds to jobs in docs ...
| * | | | | Fix tests and disallow 0 to make it consistent with .gitlab-ci.ymlLin Jen-Shin2017-02-152-1/+2
| | | | | |
| * | | | | rubocop: Align the operands of an expressionLin Jen-Shin2017-02-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C: Style/MultilineOperationIndentation: Align the operands of an expression in an assignment spanning multiple lines.
| * | | | | Use the same syntax for default expirationLin Jen-Shin2017-02-152-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23343951 * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23344036 * https://gitlab.com/gitlab-org/gitlab-ce/issues/27762#note_23344797
| * | | | | Initial implementation for default artifacts expirationLin Jen-Shin2017-02-152-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | TODO: Add tests and screenshots
* | | | | | Backport groups API to V3Robert Schilling2017-02-242-0/+39
| | | | | |
* | | | | | API: Use parameter to get owned groups instead of dedicated endpointRobert Schilling2017-02-241-12/+4
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'dm-meer-blauw-op-straat' into 'master' Robert Speicher2017-02-23109-417/+432
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable (and disable) more RuboCops See merge request !9432
| * | | | | Fix new offensesdm-meer-blauw-op-straatDouwe Maan2017-02-231-2/+2
| | | | | |
| * | | | | Stylistic tweaksDouwe Maan2017-02-236-21/+21
| | | | | |
| * | | | | Fix OAuth/SAML user blocking behaviorDouwe Maan2017-02-231-1/+3
| | | | | |
| * | | | | Revert "Enable Style/DotPosition"Douwe Maan2017-02-2318-73/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9. # Conflicts: # .rubocop.yml # .rubocop_todo.yml # lib/gitlab/ci/config/entry/global.rb # lib/gitlab/ci/config/entry/jobs.rb # spec/lib/gitlab/ci/config/entry/factory_spec.rb # spec/lib/gitlab/ci/config/entry/global_spec.rb # spec/lib/gitlab/ci/config/entry/job_spec.rb # spec/lib/gitlab/ci/status/build/factory_spec.rb # spec/lib/gitlab/incoming_email_spec.rb
| * | | | | Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-2343-209/+209
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
| * | | | | Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-234-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 96bef54154e669f9a3e92c3a4bc76c0be3a52e48.
| * | | | | Move up delegate callsDouwe Maan2017-02-231-2/+2
| | | | | |
| * | | | | ActiveSupport delegation is preferred over ForwardableDouwe Maan2017-02-231-2/+0
| | | | | |
| * | | | | Update rubocop and rubocop-rspec and regenerate .rubocop_todo.ymlDouwe Maan2017-02-232-7/+4
| | | | | |
| * | | | | Don’t exclude some file in lib from rubocopDouwe Maan2017-02-2334-206/+187
| | | | | |
| * | | | | Fix new offensesDouwe Maan2017-02-232-2/+2
| | | | | |
| * | | | | Enable Rails/DelegateDouwe Maan2017-02-2310-40/+14
| | | | | |
| * | | | | Enable Style/WordArrayDouwe Maan2017-02-238-8/+8
| | | | | |
| * | | | | Enable Style/MultilineHashBraceLayoutDouwe Maan2017-02-231-2/+4
| | | | | |
| * | | | | Enable Style/MultilineArrayBraceLayoutDouwe Maan2017-02-234-16/+20
| | | | | |
| * | | | | Enable Style/EmptyLineBetweenDefsDouwe Maan2017-02-232-0/+45
| | | | | |
| * | | | | Enable Style/ClassCheckDouwe Maan2017-02-232-3/+3
| | | | | |
| * | | | | Prefer leading style for Style/DotPositionDouwe Maan2017-02-2343-207/+207
| | | | | |
| * | | | | Fix code for copsDouwe Maan2017-02-2316-69/+81
| | | | | |
| * | | | | Enable Style/ConditionalAssignmentDouwe Maan2017-02-2311-36/+36
| | | | | |
| * | | | | Enable Style/ColonMethodCallDouwe Maan2017-02-234-4/+4
| | | | | |
| * | | | | Enable Style/BarePercentLiteralsDouwe Maan2017-02-234-8/+8
| | | | | |
| * | | | | Enable Performance/RedundantMatchDouwe Maan2017-02-234-4/+4
| | | | | |
| * | | | | Enable Performance/RedundantBlockCallDouwe Maan2017-02-232-2/+2
| | | | | |
| * | | | | Enable Performance/RedundantMergeDouwe Maan2017-02-232-2/+2
| | | | | |
| * | | | | Enable Style/SpaceInsideBracketsDouwe Maan2017-02-235-5/+5
| | | | | |
| * | | | | Enable Style/MutableConstantDouwe Maan2017-02-2332-49/+49
| | | | | |
| * | | | | Enable Style/DotPositionDouwe Maan2017-02-2318-71/+71
| | | | | |
* | | | | | Merge branch 'fix/gb/pipeline-retry-skipped-jobs' into 'master' Kamil Trzciński2017-02-231-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix reprocessing skipped jobs when retrying pipeline See merge request !9436
| * | | | | | Fix Rubocop offense in OptimisticLocking modulefix/gb/pipeline-retry-skipped-jobsGrzegorz Bizon2017-02-231-1/+1
| | | | | | |
| * | | | | | Process skipped jobs in the pipeline when retrying itGrzegorz Bizon2017-02-231-1/+3
| | | | | | |
* | | | | | | Merge branch 'api-remove-attributes_for_keys' into 'master' Rémy Coutable2017-02-232-8/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Use grape validation in the members API. See merge request !9471
| * | | | | | Use grape to validate parameters in the members APIapi-remove-attributes_for_keysRobert Schilling2017-02-232-8/+6
| | | | | | |
* | | | | | | Remove last merge_request endpointRobert Schilling2017-02-231-1/+0
|/ / / / / /
* | | | | | Merge branch 'api-notes-entity-fields' into 'master' Sean McGivern2017-02-236-5/+206
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecated `upvotes` and `downvotes` from the notes API Closes #28441 See merge request !9384
| * \ \ \ \ \ Merge branch 'master' into 'api-notes-entity-fields'api-notes-entity-fieldsRobert Schilling2017-02-226-55/+58
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # doc/api/v3_to_v4.md