summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Fix Diff::Position#diff_file for positions on straight diffsdm-diff-file-straight-diffDouwe Maan2017-06-064-18/+14
|
* Accept a username for User-level Events APIMark Fletcher2017-06-061-2/+2
|
* Introduce an Events APIMark Fletcher2017-06-064-31/+87
| | | | | | | | | | | * Meld the following disparate endpoints: * `/projects/:id/events` * `/events` * `/users/:id/events` + Add result filtering to the above endpoints: * action * target_type * before and after dates
* Merge branch '29690-rotate-otp-key-base' into 'master'Brian Neel2017-06-062-0/+103
|\ | | | | | | | | | | | | Add a Rake task to aid in rotating otp_key_base Closes #29690 See merge request !11881
| * Add a Rake task to aid in rotating otp_key_baseNick Thomas2017-06-052-0/+103
| |
* | Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'Douwe Maan2017-06-051-1/+1
|\ \ | | | | | | | | | | | | backports changed import logic from pull mirroring feature into CE See merge request !11850
| * | backports changed import logic from pull mirroring feature into CETiago Botelho2017-06-051-1/+1
| | |
* | | Merge branch 'mk-fix-git-over-http-rejections' into 'master'Douwe Maan2017-06-057-78/+148
|\ \ \ | | | | | | | | | | | | | | | | Fix Git-over-HTTP rejections See merge request !11398
| * | | Remove unnecessary variablemk-fix-git-over-http-rejectionsMichael Kozono2017-06-051-3/+1
| | | |
| * | | Extract and memoize `user_access`Michael Kozono2017-06-051-6/+9
| | | | | | | | | | | | | | | | Because it is sometimes never used.
| * | | Remove GitAccessStatus (no longer needed)Michael Kozono2017-06-054-26/+9
| | | |
| * | | Refactor construction of responseMichael Kozono2017-06-052-14/+22
| | | |
| * | | Refactor to remove a special caseMichael Kozono2017-06-052-7/+14
| | | |
| * | | Fix would-be regressionMichael Kozono2017-06-051-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/commit/57e3e942de1adef2c8621905370f07d7da7870c4 I changed it to a separate condition rather than depending on the order of the case-when statements to prevent this mistake again.
| * | | Clarify error messagesMichael Kozono2017-06-051-8/+26
| | | | | | | | | | | | | | | | And refactor to self-document a little better.
| * | | Refactor to let GitAccess errors bubble upMichael Kozono2017-06-055-45/+40
| | | | | | | | | | | | | | | | | | | | | | | | No external behavior change. This allows `GitHttpController` to set the HTTP status based on the type of error. Alternatively, we could have added an attribute to GitAccessStatus, but this pattern seemed appropriate.
| * | | Move CI access logic into GitAccessMichael Kozono2017-06-051-3/+17
| | | |
| * | | Check disabled commands in GitAccess insteadMichael Kozono2017-06-051-1/+26
| | | |
| * | | Fix Git over HTTP specMichael Kozono2017-06-053-16/+37
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * The spec has 7 failures at this point * Specify rendered error messages * Render the GitAccess message rather than “Access denied” * Render the Not Found message provided by GitAccess, instead of a custom one * Expect GitAccess to check the config for whether Git-over-HTTP pull or push is disabled, rather than doing it in the controller * Add more thorough testing for authentication * Dried up a lot of tests * Fixed some broken tests
* | | Merge branch 'added_chinese_for_i18n' into 'master'Douwe Maan2017-06-051-1/+4
|\ \ \ | | | | | | | | | | | | | | | | Add Chinese translation of Cycle Analytics Page to I18N See merge request !11644
| * | | Update i18n.rb Indent styleHuang Tao2017-06-051-3/+3
| | | |
| * | | Add translation zh_TW to I18N黄涛2017-06-051-1/+2
| | | |
| * | | Add translation zh_HK to I18N黄涛2017-06-051-1/+2
| | | |
| * | | Change the language name zh to zh_CN黄涛2017-06-051-1/+1
| | | |
| * | | Update i18n.rb stylehtve2017-06-051-1/+1
| | | |
| * | | added Simplified Chinese to I18N黄涛2017-06-051-1/+2
| | | |
* | | | Merge branch '28694-hard-delete-user-from-admin-panel' into 'master'Douwe Maan2017-06-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to be hard-deleted from the admin panel Closes #28694 See merge request !11874
| * | | | Refactor the DeleteUserWorkerNick Thomas2017-06-051-1/+1
| | |/ / | |/| |
* | | | Merge branch ↵Douwe Maan2017-06-052-9/+33
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '31983-increase-merge-request-diff-file-size-limit-for-default-toggle-opening' into 'master' Increase diff limits to 100 KB for collapse and 200 KB overall Closes #31983 See merge request !11875
| * | | Increase diff limits to 100 KB for collapse and 200 KB overall31983-increase-merge-request-diff-file-size-limit-for-default-toggle-openingSean McGivern2017-06-022-9/+33
| | |/ | |/| | | | | | | | | | | | | This is controlled with the feature flag gitlab_git_diff_size_limit_increase. Both of these limits were basically picked arbitrarily in the first place; disabling the feature flag reverts to the old limits.
* | | Merge branch 'zj-job-view-goes-real-time' into 'master'Kamil Trzciński2017-06-051-2/+6
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Initial implementation for real time job view Closes #31397 See merge request !11651
| * | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeKamil Trzcinski2017-06-0253-633/+1073
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeZ.J. van de Weg2017-06-018-21/+159
| |\ \ \
| * | | | Initial implementation for real time job viewZ.J. van de Weg2017-05-311-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the needed keys and paths to a new entity, BuildDetailsEntity. Not renaming BuildEntity to BuildBasicEntity on explicit request. Most code now has test coverage, but not all. This will be added on later commits on this branch. Resolves gitlab-org/gitlab-ce#31397
* | | | | Merge branch 'projects-api-import-status' into 'master'Douwe Maan2017-06-021-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose import_status in Projects API Closes #19646 See merge request !11851
| * | | | | Expose import_status in Projects APIRobin Bobbitt2017-06-021-0/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch '28694-hard-delete-user-from-api' into 'master'Douwe Maan2017-06-021-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow users to be hard-deleted from the API See merge request !11853
| * | | | | Allow users to be hard-deleted from the APINick Thomas2017-06-021-1/+2
| | | | | |
* | | | | | Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master'Robert Speicher2017-06-024-11/+63
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new Gitaly CommitDiff RPC See merge request !11826
| * | | | | | Use the new Gitaly CommitDiff RPCfix/use-new-gitaly-commit-diff-rpcAhmad Sherif2017-06-024-11/+63
| | | | | | |
* | | | | | | Enable the Style/PreferredHashMethods coprc/enable-PreferredHashMethods-copRémy Coutable2017-06-0214-26/+26
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '2361-pending-migrations-break-current-settings' into 'master'Rémy Coutable2017-06-021-2/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip loading application settings from the database when migrations are pending Closes gitlab-ee#2361 See merge request !11842
| * | | | | Skip loading application settings from the database when migrations are pendingNick Thomas2017-06-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various Rails initializers (metrics, sentry, etc) are run before migrations, which can lead to a mismatch between app/models/application_settings.rb and schema.
* | | | | | Merge branch '33242-create-project-for-user-api-ignores-path-parameter' into ↵Sean McGivern2017-06-021-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add optional path parameter and fix tests Closes #33242 See merge request !11868
| * | | | | | Fix missing optional path parameter in "Create project for user" API33242-create-project-for-user-api-ignores-path-parameterAthar Hameed2017-06-021-0/+1
| |/ / / / /
* | | | | | Merge branch '28080-system-checks' into 'master'Sean McGivern2017-06-0224-478/+903
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | SystemCheck library for executing checks from a rake task See merge request !9173
| * | | | | Refactor and move things around to improve in YAGNI perspectiveGabriel Mazetto2017-05-312-25/+23
| | | | | |
| * | | | | Fix BasicExecutor specsGabriel Mazetto2017-05-312-27/+11
| | | | | |
| * | | | | Fixed and improved some existing checks and SystemCheck libraryGabriel Mazetto2017-05-3111-76/+58
| | | | | |
| * | | | | Fix codestyleGabriel Mazetto2017-05-314-12/+8
| | | | | |
View Lorry Controller Status