summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Doc external users featureZeger-Jan van de Weg2016-03-151-0/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into 4009-external-usersZeger-Jan van de Weg2016-03-142-0/+34
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets2016-03-142-0/+31
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring from EE: Share Project with Group - [x] Models and migrations - [x] Logic, UI - [x] Tests - [x] Documentation - [x] Share with group lock - [x] Api feature - [x] Api docs - [x] Api tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For #12831 cc @DouweM @rspeicher @vsizov See merge request !3186
| | | * | | | | | Bring share project with group API from EEshare-project-ceDmitriy Zaporozhets2016-03-132-0/+31
| | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Merge branch 'rs-snippet-expires-api' into 'master' Robert Speicher2016-03-141-0/+3
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't remove `ProjectSnippet#expires_at` from API See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103 This partially reverts commit 836d5930332797192094ce4a3c8083e96f7e8c53. See merge request !3144
| | | * | | | | Don't remove `ProjectSnippet#expires_at` from APIrs-snippet-expires-apiRobert Speicher2016-03-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103 This partially reverts commit 836d5930332797192094ce4a3c8083e96f7e8c53.
| * | | | | | | External UsersZeger-Jan van de Weg2016-03-131-2/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects.
| * | | | | | Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""Stan Hu2016-03-121-0/+50
| | | | | | | | | | | | | | | | | | | | | This reverts commit 5a586f364c5d2b866d6a074eff7996f05585b7d5
| * | | | | | Revert "Merge branch 'support-go-subpackages' into 'master' "Douwe Maan2016-03-121-50/+0
| | | | | | | | | | | | | | | | | | | | | This reverts merge request !3191
| * | | | | | Merge branch 'support-go-subpackages' into 'master' Douwe Maan2016-03-121-0/+50
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support Golang subpackage fetching Closes #13805 See merge request !3191
| | * | | | | Ensure PATH_INFO exists for go-getStan Hu2016-03-121-1/+1
| | | | | | |
| | * | | | | Simplify codeStan Hu2016-03-121-4/+3
| | | | | | |
| | * | | | | Support Golang subpackage fetchingsupport-go-subpackagesStan Hu2016-03-121-0/+51
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Closes #13805
| * | | | | Merge branch 'fix-gh-pr-import' into 'master' Douwe Maan2016-03-122-9/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix importing PR's from GitHub when the source repo was removed Closes #13847 Closes gitlab-com/support-forum#584 See merge request !3172
| | * | | | | Fix importing PR's from GitHub when the source repo was removedDouglas Barbosa Alexandre2016-03-102-9/+12
| | | | | | |
| | * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵redis-config-parserJacob Vosmaer2016-03-101-0/+121
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | redis-config-parser
| * | | | | | Merge branch 'rs-issue-12944' into 'master' Douwe Maan2016-03-111-0/+23
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a custom Devise failure app to handle unauthenticated .zip requests Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944 See merge request !2828
| | * | | | | | Use a custom Devise failure app to handle unauthenticated .zip requestsrs-issue-12944Robert Speicher2016-03-081-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944
| * | | | | | | Removed order from sub-query projects for searchYorick Peterse2016-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to order queries used as sub-queries and doing so can add potential overhead.
| * | | | | | | Added ProjectSearchResults#project_ids_relationYorick Peterse2016-03-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures some other methods such as the "issues" method still work.
| * | | | | | | Refactor Gitlab::ProjectSearchResultsYorick Peterse2016-03-111-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this class would be given a project ID which was then used to retrieve the corresponding Project object. However, in all cases the Project object was already known as it was used to grab the ID to pass to ProjectSearchResults. By just passing a Project instead we remove the need for an extra query as well as the need for some other complexity in this class.
| * | | | | | | Refactor Gitlab::SnippetSearchResultsYorick Peterse2016-03-111-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for plucking snippet IDs into memory.
| * | | | | | | Refactor Gitlab::SearchResultsYorick Peterse2016-03-111-9/+16
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of plucking IDs this class now uses ActiveRecord::Relation objects. Plucking IDs is problematic as searching for projects can lead to a huge amount of IDs being loaded into memory only to be used as an argument for another query (instead of just using a sub-query).
| * | | | | | Merge branch 'remove-benchmark-suite' into 'master' Douwe Maan2016-03-111-11/+2
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed benchmark suite and its documentation Related issue: gitlab-org/gitlab-ce#13718 See merge request !3137
| | * | | | | Removed benchmark suite and its documentationremove-benchmark-suiteYorick Peterse2016-03-101-11/+2
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rationale for this can be found in https://gitlab.com/gitlab-org/gitlab-ce/issues/13718 but in short the benchmark suite no longer serves a good purpose now that we have proper production monitoring in place. Fixes gitlab-org/gitlab-ce#13718
| * | | | | Merge branch 'gitlab-ci-yaml-alias' into 'master' Kamil Trzciński2016-03-111-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support YAML alias/anchor usage in .gitlab-ci.yml This allows to reuse one job as a template for another one: ``` job1: &JOBTMPL script: execute-script-for-job job2: *JOBTMPL ``` This also helps to solve some of the issues in gitlab-org/gitlab-ci#342 See merge request !2958
| | * | | | Support YAML alias/anchor usage in .gitlab-ci.ymlPascal Bach2016-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to reuse one job as a template for another one: ``` job1: &JOBTMPL script: execute-script-for-job job2: *JOBTMPL ``` This also helps to solve some of the issues in #342 Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Fabio Huser <fabio.huser@siemens.com>
| * | | | | web hooks to webhooksashleys2016-03-102-8/+8
| | | | | |
| * | | | | Typoexpiring-lockJacob Vosmaer2016-03-101-1/+1
| | | | | |
| * | | | | Make comment less ambivalentJacob Vosmaer2016-03-101-2/+1
| | | | | |
| * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-03-101-0/+121
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | expiring-lock
| * | | | | Remove unnecessary random keyJacob Vosmaer2016-03-101-7/+1
| | | | | |
| * | | | | Improve commentJacob Vosmaer2016-03-101-2/+2
| | | | | |
| * | | | | Move method to UserJacob Vosmaer2016-03-103-14/+14
| | | | | |
| * | | | | Explain LDAP "lock" behaviorJacob Vosmaer2016-03-101-2/+6
| | | | | |
| * | | | | Rename ExpiringLock to ExclusiveLeaseJacob Vosmaer2016-03-103-53/+38
| | | | | |
| * | | | | Acquire lock before LDAP syncJacob Vosmaer2016-03-093-2/+61
| | |_|_|/ | |/| | |
| * | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-03-091-28/+34
| |\ \ \ \ | | | | | | | | | | | | | | | | | | redis-config-parser
| * | | | | Always with the newlinesJacob Vosmaer2016-03-091-1/+1
| | | | | |
| * | | | | Parse config/resque.yml in one place onlyJacob Vosmaer2016-03-092-3/+33
| | | | | |
* | | | | | Prevent projects to have higher visibility than groupsFelipe Artur2016-03-103-0/+9
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Prevent Groups to have smaller visibility than projects Add default_group_visibility_level to configuration Code improvements
* | | | | Merge branch 'rs-sprite-task' into 'master' Dmitriy Zaporozhets2016-03-091-0/+121
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `gemojione:sprite` Rake task This task will generate a standard and Retina sprite of all of the current Gemojione Emojis, with the accompanying SCSS map. It will not appear in `rake -T` output, and the dependent gems are not included in the Gemfile by default, because this task will only be needed occasionally. See merge request !3130
| * | | | Add a `gemojione:sprite` Rake taskRobert Speicher2016-03-091-0/+121
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This task will generate a standard and Retina sprite of all of the current Gemojione Emojis, with the accompanying SCSS map. It will not appear in `rake -T` output, and the dependent gems are not included in the Gemfile by default, because this task will only be needed occasionally. [ci skip]
* | | | Retry spinach testsKamil Trzcinski2016-03-091-28/+34
| |/ / |/| |
* | | Merge branch 'iurisilvio/gitlab-ce-bitbucket_closed' into 'master' Rémy Coutable2016-03-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where Bitbucket 'closed' issues were imported as 'opened' _Originally opened at !2930 by @iurisilvio._ - - - Bitbucket has an undocumented status `closed`. https://confluence.atlassian.com/bitbucket/issues-resource-296095191.html Related to https://gitlab.com/gitlab-com/support-forum/issues/559 See merge request !2973
| * | | Fix bug where Bitbucket `closed` issues were imported as `opened`iurisilvio/gitlab-ce-bitbucket_closedIuri de Silvio2016-03-071-1/+1
| | |/ | |/|
* | | Merge branch 'rs-snippets-dont-expire' into 'master' Dmitriy Zaporozhets2016-03-091-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | Remove `Snippet#expires_at` This was removed from the interface in https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation lingered around for two years. See merge request !3103
| * | Remove `Snippet#expires_at`rs-snippets-dont-expireRobert Speicher2016-03-051-1/+1
| | | | | | | | | | | | | | | | | | This was removed from the interface in https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation lingered around for two years.
* | | Merge branch 'evuez/gitlab-ce-add-info-user-api' into 'master' Robert Speicher2016-03-081-0/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Expose User#last_sign_in_at and User#confirmed_at for admins Closes #840 See merge request !3090
| * | Add fields to GET /users/* API endpoints for adminsevuez/gitlab-ce-add-info-user-apievuez2016-03-041-0/+2
| | | | | | | | | | | | | | | | | | | | | Added fields are last_sign_in_at and confirmed_at. They are available for GET /users/ and GET /users/:id for admins. Closes #840
View Lorry Controller Status