summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'fix-allowed-conflict-size' into 'master' Rémy Coutable2016-09-071-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix merge conflict size limit ## What does this MR do? The merge conflict size limit was set to 100 KB, but the docs (and the test repo, which the feature specs use) say 200 KB! ## Are there points in the code the reviewer needs to double check? Don't think so. ## Why was this MR needed? Derp. ## 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) - Tests - [x] Added for this feature/bug - [ ] 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 !6052
| * | | | | | | Fix merge conflict size limitfix-allowed-conflict-sizeSean McGivern2016-09-071-1/+1
| | | | | | | |
* | | | | | | | Use PipelinesFinder in Pipelines APIZ.J. van de Weg2016-09-071-1/+4
|/ / / / / / /
* | | | | | | Improve curl commend, remove blank linesKatarzyna Kobierska2016-09-071-2/+0
| | | | | | |
* | | | | | | Fix invalid curl commandKatarzyna Kobierska2016-09-071-4/+5
| | | | | | |
* | | | | | | Add Documentation to Ci Lint APIKatarzyna Kobierska2016-09-071-3/+3
| | | | | | |
* | | | | | | Code refactorKatarzyna Kobierska2016-09-072-1/+2
| | | | | | |
* | | | | | | Improve codeKatarzyna Kobierska2016-09-072-23/+16
| | | | | | |
* | | | | | | Code refactoringKatarzyna Kobierska2016-09-072-31/+28
| | | | | | |
* | | | | | | Fix errors and grammarKatarzyna Kobierska2016-09-071-13/+10
| | | | | | |
* | | | | | | Fix rubocop errorsKatarzyna Kobierska2016-09-071-1/+1
| | | | | | |
* | | | | | | Change class method nameKatarzyna Kobierska2016-09-072-5/+5
| | | | | | |
* | | | | | | Add class method to encapsulate exceptionKatarzyna Kobierska2016-09-072-18/+25
| | | | | | |
* | | | | | | Move lint to api from ci/apiKatarzyna Kobierska2016-09-074-39/+39
| | | | | | |
* | | | | | | Add params requires to lintKatarzyna Kobierska2016-09-072-21/+21
| | | | | | |
* | | | | | | Fix rubocop testsKatarzyna Kobierska2016-09-071-2/+1
| | | | | | |
* | | | | | | Add tests for API CI LintKatarzyna Kobierska2016-09-072-16/+24
| | | | | | |
* | | | | | | API for CI LintKatarzyna Kobierska2016-09-073-0/+32
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'master' into feature/fork-to-group-apiOlaf Tomalka2016-09-063-18/+0
|\ \ \ \ \ \
| * | | | | | Clean up search result classesclean_up_search_classesValery Sizov2016-09-063-18/+0
| | |_|/ / / | |/| | | |
* | | | | | Higher code quality for fork to namespace APIOlaf Tomalka2016-09-061-1/+0
| | | | | |
* | | | | | Improved code quality on API fork namespace featureOlaf Tomalka2016-09-061-3/+6
| | | | | |
* | | | | | Added fork API paremeter for a specific namespaceOlaf Tomalka2016-09-061-2/+14
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Browser interface allows forking to an owned grup. This commit brings API up to speed by providing optional namespace parameter to fork API. This allows forking to users and groups under forker's control using their id or unique name. Fixes #21591
* | | | | Merge branch 'safe-ref-updates' into 'master' Douwe Maan2016-09-051-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Safer ref updates Use `git update-ref` to prevent clobbering concurrent ref updates. If rugged/libgit2 is temporarily confused, due to concurrent `git gc` for example, then it used to be possible to accidentally reset a ref to an earlier state and lose commits. Because `git update-ref` does not get confused by `git gc`, what will happen now is that the commit based on confused information fails, preventing data loss. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20353 See merge request !6130
| * | | | Use 'git update-ref' for safer web commitsJacob Vosmaer2016-09-021-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'internal_recovery_api' into 'master' Douwe Maan2016-09-021-5/+9
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Minor edits to two_factor_recovery_codes API error catching Minor fixes to the `two_factor_recovery_codes` internal API making the conditionals more sane. Thanks @DouweM for pointing it out. See merge request !6000
| * | | Minor edits to two_factor_recovery_codes API error catchingDrew Blessing2016-08-311-5/+9
| | |/ | |/|
* | | Merge branch 'issue_19734' into 'master' Douwe Maan2016-09-016-13/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project tools visibility level ## part of #19734 ![project_features_access_level](/uploads/81ec7185d4e61d7578652020209af925/project_features_access_level.png) ## 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 - Tests - [x] Added for this feature/bug - [x] 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 !5606
| * | | Project tools visibility levelFelipe Artur2016-09-016-13/+24
| | | |
* | | | Merge branch 'merge-request-sha-info' into 'master' Douwe Maan2016-09-011-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge request sha info ## What does this MR do? Exposes `sha` and `merge_commit_sha` items in `MergeRequest` API endpoint data. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? It's useful information. ## What are the relevant issue numbers? Closes #20456. ## Screenshots (if relevant) N/A ## 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 - Tests - [x] Added for this feature/bug - [x] 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 !5966
| * | | | entities: expose {,merge_commit_}sha in MergeRequestBen Boeckel2016-08-311-0/+2
| | | | | | | | | | | | | | | | | | | | Fixes #20456.
* | | | | Merge branch 'js-tooltips-for-mentions' into 'master' Robert Speicher2016-09-016-15/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use JavaScript tooltips for mentions ## What does this MR do? - use JavaScript tooltips instead of plain title for mentions (issue, merge request, snippet, user, group, commit, commit range, milestone) ## Why was this MR needed? JavaScript tooltips look nicer and can wrap. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5261#note_13106713, fixes #21500 See merge request !5301
| * | | | | Use JavaScript tooltips for mentions (!5301)winniehell2016-09-016-15/+12
| | | | | |
* | | | | | GitHub importer use default project visibility for non-private projectsDouglas Barbosa Alexandre2016-08-311-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'refactor/add-policies' into 'master' Robert Speicher2016-08-313-12/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor ability.rb into Policies ## What does this MR do? Factors out `ability.rb` into a new abstraction - the "policy" (stored in `app/policies`). A policy is a class named `#{class_name}Policy` (looked up automatically as needed) that implements `rules` as follows: ``` ruby class ThingPolicy < BasePolicy def rules @user # this is a user to determine abilities for, optionally nil in the anonymous case @subject # this is the subject of the ability, guaranteed to be an instance of `Thing` can! :some_ability # grant the :some_ability permission cannot! :some_ability # ensure that :some_ability is not allowed. this overrides any `can!` that is called before or after delegate! @subject.other_thing # merge the abilities (can!) and prohibitions (cannot!) from `@subject.other_thing` can? :some_ability # test whether, so far, :some_ability is allowed end def anonymous_rules # optional. if not implemented `rules` is called where `@user` is nil. otherwise this method is called when `@user` is nil. end end ``` See merge request !5796
| * | | | use a nil subject when we want to check global abilitieshttp://jneen.net/2016-08-302-2/+2
| | | | |
| * | | | remove Ability.abilitieshttp://jneen.net/2016-08-302-6/+2
| | | | |
| * | | | remove six, and use a Set insteadhttp://jneen.net/2016-08-301-5/+1
| | | | |
* | | | | Add BroadcastMessage API implementationRobert Speicher2016-08-313-0/+105
| | | | |
* | | | | Merge branch ↵Robert Speicher2016-08-314-51/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '21567-fix-sorting-issues-by-last-updated-after-import-from-github' into 'master' Fix sorting issues by "last updated" after import from GitHub ## What does this MR do? Don't touch Issue/Merge Request when importing GitHub comments as it will trigger an update on `updated_at` field. It also use `updated_at` as the last updated date doesn't matter the Issue/Pull Request state. ## Why was this MR needed? After import from GitHub, sorting issues by "last updated" doesn't work as expected. ## What are the relevant issue numbers? Fixes #21567 See merge request !6110
| * | | | | Don't touch Issue/Merge Request when importing GitHub commentsDouglas Barbosa Alexandre2016-08-311-6/+8
| | | | | |
| * | | | | Use updated_at as the last updated date when importing from GitHubDouglas Barbosa Alexandre2016-08-313-45/+8
| | | | | |
* | | | | | Merge branch 'fix-sidekiq-sentry-context' into 'master' Robert Speicher2016-08-311-0/+27
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Sentry not reporting right program for Sidekiq workers Moves program tag into the global configuration since this doesn't change and since Sidekiq workers get a unique context for each event. Closes #21410 See merge request !6004
| * | | | | Fix Sentry not reporting right program for Sidekiq workersfix-sidekiq-sentry-contextStan Hu2016-08-251-0/+27
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves program tag into the global configuration since this doesn't change and since Sidekiq workers get a unique context for each event. Closes #21410
* | | | | Merge branch 'api-confidential-issues' into 'master' Robert Speicher2016-08-312-2/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Expose issue confidentiality flag. ## What does this MR do? This MR adds support for confidential issues the the API. The property as exposed and users can create or update confidential issues. ## What are the relevant issue numbers? Closes #17199 See merge request !5384
| * | | | | API: Expose issue#confidentialapi-confidential-issuesRobert Schilling2016-08-312-2/+13
| | |_|/ / | |/| | |
* | | | | Don't expose a user's private token in the `/api/v3/user` API.Timothy Andrew2016-08-311-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | - This would allow anyone with a personal access token (even a read-only token, once scopes are implemented) to escalate their access by obtaining the private token.
* | | | Merge branch 'project-specific-lfs' into 'master' Robert Speicher2016-08-302-4/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added project specific enable/disable setting for LFS ## What does this MR do? Adds project specific enable/disable setting for LFS ## What are the relevant issue numbers? Needed for #18092 See merge request !5997
| * | | | Renamed `enable_lfs` to `lfs_enabled` for the Project field, and related fixes.project-specific-lfsPatricio Cano2016-08-302-6/+8
| | | | |
| * | | | Added CHANGELOG, documentation, and API functionalityPatricio Cano2016-08-302-3/+7
| | | | |
View Lorry Controller Status