summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-201-53/+10
|
* Change `return`s for `next`s to please rubocop (behaviour is the same)Alejandro Rodríguez2016-07-201-2/+2
|
* Add /deploy_keys API to retrieve all deploy keys regardless of project ↵Alejandro Rodríguez2016-07-201-53/+66
| | | | | | | affiliation Also, in favour of consistency, deprecate `/projects/:id/keys/...` routes in favour of `/projects/:id/deploy_keys/...`
* Merge branch 'migration-downtime-tags' into 'master' Robert Speicher2016-07-204-0/+140
|\ | | | | | | | | | | | | | | | | Added checks for migration downtime This adds a set of checks that check/list which migrations require downtime (or not). It also comes with a CI task that fails should a migration not be tagged properly. Fixes #14545 See merge request !4911
| * Added checks for migration downtimemigration-downtime-tagsYorick Peterse2016-07-204-0/+140
| | | | | | | | | | | | | | | | | | | | | | These new checks can be used to check if migrations require downtime or not (as tagged by their authors). In CI this compares the current branch with master so migrations added by merge requests are automatically verified. To check the migrations added since a Git reference simply run: bundle exec rake gitlab:db:downtime_check[GIT_REF]
* | Merge branch 'rubocop/enable-multiline-ternary-operator-cop' into 'master' Robert Speicher2016-07-201-2/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/MultilineTernaryOperator rubocop cop Avoid multi-line ?: (the ternary operator). Use if/unless instead. See #17478 See merge request !4356
| * | Enable Style/MultilineTernaryOperator rubocop coprubocop/enable-multiline-ternary-operator-copGrzegorz Bizon2016-07-201-2/+1
| | | | | | | | | | | | | | | | | | Avoid multi-line ?: (the ternary operator). Use if/unless instead. See #17478
* | | Use limit parameter rather than hardcoded valueM. Ricketts2016-07-201-1/+1
| | |
* | | Ensure to_json methods take optional argumentSean McGivern2016-07-202-4/+4
| | |
* | | Merge branch 'remove-parse-boolean' into 'master' Rémy Coutable2016-07-204-8/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace parse_boolean with to_boolean ## What does this MR do? Replaces `.parse_boolean` with the new `.to_boolean` as we talked in the other MR. ## 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)~~ ~~- [ ] API support added~~ - Tests ~~- [ ] 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 !5355
| * | Replace parse_boolean with to_booleanRobert Schilling2016-07-204-8/+4
| |/
* | Limit git rev-list output count to one in forced push checkAhmad Sherif2016-07-191-2/+2
| |
* | Fix help page paths to make sure shortcuts and the UI help page work.fix-help-pathsConnor Shea2016-07-191-1/+1
| | | | | | | | | | | | Add a test to make sure the help page UI path doesn't break in the future. Fix #19972 and #19889.
* | Merge branch 'allow-deploy-key-to-download-public-projects' into 'master' Rémy Coutable2016-07-191-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to pull code with deploy key from public projects ## What does this MR do? With deploy keys you can download any public projects stored in GitLab. ## What are the relevant issue numbers? Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/1217 ## 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) See merge request !5316
| * | Allow to pull code with deploy key from public projectsallow-deploy-key-to-download-public-projectsKamil Trzcinski2016-07-191-0/+1
| | |
* | | Merge branch 'fix/import-export-project-avatar' into 'master' Rémy Coutable2016-07-195-7/+78
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project avatar import/export functionality Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19851 Adds logic to export and import a project avatar - [x] [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)~~ - 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 !5273
| * | | squashed - added avatar saver/restorer and specsfix/import-export-project-avatarJames Lopez2016-07-195-7/+78
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added spec for avatar saver avatar saver! added avatar restorer spec fix spec added avatar restorer class fix export service fix warnings, added changelog fix spec some refactoring based on feedback fixed a few issues after testing i/e avatar
* | | Improve code designKamil Trzcinski2016-07-191-1/+1
| | |
* | | Fix broken builds_for_refKamil Trzcinski2016-07-191-1/+1
| | |
* | | Use value of `yaml_variables` and `when` from config_processor if undefinedKamil Trzcinski2016-07-191-32/+33
| | |
* | | Merge branch 'manual-actions' into 'master' Rémy Coutable2016-07-191-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for manual CI actions ## What does this MR do? This implements a `when: manual` which allows a jobs to be marked as manual actions. Manual actions have to be explicitly executed by developers. ## What are the relevant issue numbers? This is to solve: https://gitlab.com/gitlab-org/gitlab-ce/issues/17010 See merge request !5297
| * | | Add implementation of manual actionsKamil Trzcinski2016-07-181-2/+2
| | | |
* | | | Merge branch 'api-cleanup-entities' into 'master' Rémy Coutable2016-07-192-42/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify entities for branches and tags API ## What does this MR do? As talked in !5208, I improved the entity for branches and tags. ## 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)~~ See merge request !5343
| * | | | Simplify entities for branches and tags APIapi-cleanup-entitiesRobert Schilling2016-07-192-42/+21
| | |/ / | |/| |
* | | | Merge branch 'deployment-tracking' into 'master' Rémy Coutable2016-07-191-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Rake task for tracking deployments ## What does this MR do? This MR adds a Rake task to track the current version of GitLab in InfluxDB. ## Are there points in the code the reviewer needs to double check? We may want to document this Rake task in some Markdown file, but I'm not sure what the best place for this would be. ## Why was this MR needed? We want to have a more accurate overview of when deployments occurred. ## What are the relevant issue numbers? https://gitlab.com/gitlab-com/infrastructure/issues/98 ## 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] 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5320
| * | | | Added Rake task for tracking deploymentsdeployment-trackingYorick Peterse2016-07-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simply inserts the current GitLab version in the "deployments" measurement. Fixes gitlab-com/infrastructure#98
* | | | | Merge branch 'api-delete-todos' into 'master' Rémy Coutable2016-07-191-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Api delete todos ## What does this MR do? It changes the `DELETE /todos` to only return the number of marked todos. ## Why was this MR needed? Before it returned the marked todos as an paginated array. Since we deleted/marked the todos, there was no way to get the rest of the todos. ## What are the relevant issue numbers? Closes #19678 ## 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 !5341
| * | | | Return the number of marked todosapi-delete-todosRobert Schilling2016-07-191-1/+1
| | | | |
* | | | | Merge branch 'api-dev-can-push' into 'master' Rémy Coutable2016-07-193-4/+36
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Expose 'developers_can_push' for branches ## What does this MR do? Adds support for the `developers_can_push` flag for the branches API. It also supports creating protected branches with that flag. ## Are there points in the code the reviewer needs to double check? The API call requires an optional boolean parameter `developers_can_push`. If it is not either `true` or `false`, it should not update the value. I'm not sure if this is the right way to do it. Right now it always returns `200`. Maybe the `PUT` method should return different status codes depending if it really created or updated a branch. ## What are the relevant issue numbers? Closes #12735 ## 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 !5208
| * | | | Only update onceRobert Schilling2016-07-191-2/+3
| | | | |
| * | | | API: Expose 'developers_can_merge' for branchesRobert Schilling2016-07-192-1/+11
| | | | |
| * | | | API: Expose 'developers_can_push' for branchesRobert Schilling2016-07-193-4/+25
| | | | |
* | | | | Squashed - fix encoding issuefix/import-export-encodingJames Lopez2016-07-193-2/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WIP - trying to replicate UTF-8 error fix spec fixing encoding issue and another spec, to do with MR diffs fix issue and spec failure Add changelog and bumped up I/E version fix spec based on feedback - omitted target project
* | | | Merge branch 'cs-gemojione-3' into 'master' Robert Speicher2016-07-182-23/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade gemojione to 3.0.0 Upgrades gemojione to 3.0.0, see the Changelog: https://github.com/jonathanwiesel/gemojione/blob/b98aa8b07eef815d4d3f52ff3c8714b28932b0de/CHANGELOG.md#v300-2016-07-12 [Here are all the new 2016 emoji](http://emojione.com/releases/2.2.4/) :tada: This update has new emoji and more sensical categories. See merge request !5237
| * | | | Upgrade Gemojione from 2.6.1 to 3.0.1.Connor Shea2016-07-182-23/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the 2016 emoji as well as support for using SVG images instead of PNGs. It also fixes a number of incorrectly categorized emoji and other minor issues. Upgrade Rake task for Gemojione 3.0.0 and generate sprites. Upgrade aliases.json by pulling down index.json from the gemojione repository and running the generate_aliases.rb file. Changelog: https://github.com/jonathanwiesel/gemojione/blob/master/CHANGELOG.md#v301-2016-07-16 For the specific emoji added to the Unicode standard, see: http://emojione.com/releases/2.2.4/ Huge kudos to Jonathan Wiesel (@jonathanwiesel) for his work on the gemojione gem!
* | | | | Merge branch '19820-safer-diffs' into 'master' Douwe Maan2016-07-181-5/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collapsed diffs lines/size don't accumulate to overflow diffs. ## What does this MR do? Reduce the number of lines that we highlight on big diffs to try to reduce the degradation introduced by !4990 as you can see on the issue description #19820 . We collapse any files after the diff is over the number of safe files (100), or over the safe lines (500) or over the safe number of bytes (5KB x 100 files). We still need to bump the gitlab_git and point this branch to the new gitlab_git version. ## What are the relevant issue numbers? Closes #19820 Closes #19885 ## Does this MR meet the acceptance criteria? - [x] [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 - [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 !5306
| * | | | Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-181-5/+1
| | | | |
* | | | | Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-stateRémy Coutable2016-07-189-136/+213
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'"" ## What does this MR do? Reverts the revert of !4892 which lacked an EE MR at the time. This has been done in gitlab-org/gitlab-ee!564. ## What are the relevant issue numbers? Closes #19872. See merge request !5310
| * | | | | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-189-136/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50. See !4892. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '18593-avoid-parse_html-when-rinku-didnt-do-anything' into ↵Yorick Peterse2016-07-181-0/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Don't parse Rinku returned value to DocFragment when didn't change original html string. See merge request !5311
| * | | | | Don't parse Rinku returned value to DocFragment when it didn't change the ↵18593-avoid-parse_html-when-rinku-didnt-do-anythingPaco Guzman2016-07-181-0/+2
| | |_|_|/ | |/| | | | | | | | | | | | | original html string.
* | | | | Merge branch 'store-variables-and-when-in-builds-table' into 'master' Rémy Coutable2016-07-181-15/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store when and yaml variables in builds table ## What does this MR do? Stores `when` and `yaml_variables` in `ci_builds` table. ## Why was this MR needed? This is done in order to simplify the code responsible for creating a pipeline builds. ## What are the relevant issue numbers? This made as a pre-step for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5295. ## 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5296
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵store-variables-and-when-in-builds-tableKamil Trzcinski2016-07-1816-227/+116
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | store-variables-and-when-in-builds-table # Conflicts: # db/schema.rb
| * | | | | | Store when and yaml variables in builds tableKamil Trzcinski2016-07-161-15/+38
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'docker-registry-work-with-redirect' into 'master' Rémy Coutable2016-07-182-21/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make docker registry work with location redirects when external storage is used ## What does this MR do? Honor `Location:` header when working with local registry. Location makes it possible to download manifests from external storage. ## What are the relevant issue numbers? Fixed https://gitlab.com/gitlab-org/gitlab-ce/issues/18477 ## Remark Adding `FollowRedirects` makes that we leak `Authorization:` in followed requests. That is why it is implemented manually and we are explicitly removing `Authorization` header. cc @marin @twk3 See merge request !4677
| * | | | | | Make rubocop happyKamil Trzcinski2016-07-151-1/+1
| | | | | | |
| * | | | | | Explicitly remove authorization token and make sure that invalid addresses ↵Kamil Trzcinski2016-07-151-37/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | are properly handled
| * | | | | | Allow blob to be redirectedKamil Trzcinski2016-07-151-3/+34
| | | | | | |
| * | | | | | Make docker registry work with location redirects when external storage is usedKamil Trzcinski2016-07-151-1/+1
| | | | | | |
* | | | | | | allow empty repos on import/exportJames Lopez2016-07-184-10/+5
| |_|_|/ / / |/| | | | |