Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Make sure that token `ensure_*` method always returns a token | Grzegorz Bizon | 2015-12-11 | 1 | -1/+8 | |
| | | | | ||||||
* | | | | Add specs for `TokenAuthenticatable` concern | Grzegorz Bizon | 2015-12-11 | 1 | -0/+50 | |
|/ / / | ||||||
* | | | Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence' | Douwe Maan | 2015-12-11 | 1 | -1/+20 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Merge branch 'master' into copying-file-seen-as-licence | Zeger-Jan van de Weg | 2015-12-10 | 71 | -310/+801 | |
| |\ \ | | |/ | ||||||
| * | | Licence also accepted as license file | Zeger-Jan van de Weg | 2015-12-10 | 1 | -1/+10 | |
| | | | ||||||
| * | | Merge branch 'master' into copying-file-seen-as-licence | Zeger-Jan van de Weg | 2015-11-11 | 21 | -164/+741 | |
| |\ \ | ||||||
| * | | | Add specs on #license | Zeger-Jan van de Weg | 2015-10-15 | 1 | -0/+11 | |
| | | | | ||||||
* | | | | Don't allow to edit award emoji commentsemoji_edit_disallow | Valery Sizov | 2015-12-10 | 1 | -0/+17 | |
| |_|/ |/| | | ||||||
* | | | Merge branch 'master' into split-up-builds | Douwe Maan | 2015-12-09 | 1 | -1/+65 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'master' into merge-if-green | Douwe Maan | 2015-12-09 | 3 | -0/+3 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # config/routes.rb | |||||
| * \ \ \ | Merge branch 'master' into zj/gitlab-ce-merge-if-green | Douwe Maan | 2015-12-08 | 6 | -1/+165 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' into merge-if-green | Zeger-Jan van de Weg | 2015-12-07 | 11 | -205/+276 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Button fix | Zeger-Jan van de Weg | 2015-12-07 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Incorporate feedback | Zeger-Jan van de Weg | 2015-12-05 | 1 | -8/+36 | |
| | | | | | | | ||||||
| * | | | | | | Specs for 'Merge When Build Succeeds' | Zeger-Jan van de Weg | 2015-12-02 | 1 | -0/+24 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' into merge-if-green | Zeger-Jan van de Weg | 2015-11-18 | 23 | -47/+303 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | API support, incorporated feedback | Zeger-Jan van de Weg | 2015-11-18 | 1 | -1/+13 | |
| | | | | | | | | ||||||
* | | | | | | | | Tag model specs | Douwe Maan | 2015-12-09 | 68 | -68/+68 | |
| |_|_|_|/ / / |/| | | | | | | ||||||
* | | | | | | | Update annotations | Stan Hu | 2015-12-08 | 3 | -0/+3 | |
| |_|_|/ / / |/| | | | | | ||||||
* | | | | | | Add custom NamespaceValidator | Robert Speicher | 2015-12-07 | 1 | -1/+17 | |
| | | | | | | ||||||
* | | | | | | Add custom ColorValidator | Robert Speicher | 2015-12-07 | 1 | -0/+15 | |
| | | | | | | ||||||
* | | | | | | Add custom UrlValidator | Robert Speicher | 2015-12-07 | 1 | -0/+16 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ce | Dmitriy Zaporozhets | 2015-12-07 | 1 | -0/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Handle and report SSL errors in Web hook test. Check for status 200 for success. | Stan Hu | 2015-12-04 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a Web hook test fails due to an SSL error or some other error, report the result back to the user instead of an Error 500. Closes #3656 Handle response | |||||
* | | | | | | | Merge branch 'webhook_payload_with_changes' into 'master' | Valery Sizov | 2015-12-07 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add added, modified and removed properties to commit object in webhook https://gitlab.com/gitlab-org/gitlab-ee/issues/20 See merge request !1988 | |||||
| * | | | | | | | fixes after reviewwebhook_payload_with_changes | Valery Sizov | 2015-12-07 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | fox specs | Valery Sizov | 2015-12-07 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Add added, modified and removed properties to commit object in webhook | Valery Sizov | 2015-12-04 | 1 | -0/+11 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge branch 'issue_1156' | Douwe Maan | 2015-12-07 | 1 | -0/+100 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Call update hook from new GitHooksService class. #3069 | Rubén Dávila | 2015-12-03 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Run custom Git hooks when creating or deleting branches through the UI. #1156 | Rubén Dávila | 2015-12-03 | 1 | -0/+100 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'master' into link-refs | Douwe Maan | 2015-12-03 | 1 | -1/+3 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Fix broken spec related to MySQL and fractional seconds support. | Rubén Dávila | 2015-12-03 | 1 | -1/+3 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'master' into link-refs | Douwe Maan | 2015-12-02 | 2 | -41/+27 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Merge branch 'rails_update_to_4_2' into 'master' | Valery Sizov | 2015-11-30 | 2 | -41/+27 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails update to 4.2.4 https://gitlab.com/gitlab-org/gitlab-ce/issues/2694 See merge request !1902 | |||||
| | * | | | | | fix specsrails_update_to_4_2 | Valery Sizov | 2015-11-30 | 2 | -41/+27 | |
| | | | | | | | ||||||
* | | | | | | | Render commit reference using short sha, but include full sha in comment. | Douwe Maan | 2015-12-01 | 2 | -6/+33 | |
| | | | | | | | ||||||
* | | | | | | | Fix specs | Douwe Maan | 2015-11-30 | 1 | -10/+6 | |
| | | | | | | | ||||||
* | | | | | | | Render commit range reference with short shas, link to full shas. | Douwe Maan | 2015-11-30 | 1 | -66/+45 | |
|/ / / / / / | ||||||
* | | | | | | Strip attributes for Milestone and Issuable. #3428 | Jose Corcuera | 2015-11-26 | 1 | -0/+20 | |
|/ / / / / | ||||||
* | | | | | Handle removed source projects in MR CI commitsfix-merge-requests-without-source-projects | Yorick Peterse | 2015-11-20 | 1 | -0/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling MergeRequest#ci_commit the code would previously raise an error if the source project no longer existed (e.g. because the user removed their fork). See #3599 for more information. | |||||
* | | | | | Merge branch 'emoji_votes' into 'master' | Dmitriy Zaporozhets | 2015-11-19 | 2 | -86/+12 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Award Emoji This it first iteration of award emoji feature. We have plan to extend emoji picker by the next release. For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like ":+1:" and any other. You can post not only emoji that listed in the emoji picker. See merge request !1825 | |||||
| * | | | | | fox testsemoji_votes | Valery Sizov | 2015-11-19 | 1 | -3/+2 | |
| | | | | | | ||||||
| * | | | | | added specs | Valery Sizov | 2015-11-19 | 1 | -0/+13 | |
| | | | | | | ||||||
| * | | | | | added spinach tests | Valery Sizov | 2015-11-19 | 1 | -75/+0 | |
| | | | | | | ||||||
| * | | | | | award emoji | Valery Sizov | 2015-11-19 | 1 | -11/+0 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Refactor User#authorized_groups/projects | Yorick Peterse | 2015-11-18 | 1 | -22/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods no longer include public groups/projects (that don't belong to the actual user) as this is handled by the various finder classes now. This also removes the need for passing extra arguments. Note that memoizing was removed _explicitly_. For whatever reason doing so messes up the users controller to a point where it claims a certain user does _not_ have access to certain groups/projects when it does have access. Existing code shouldn't be affected as these methods are only called in ways that they'd run queries anyway (e.g. a combination of "any?" and "each" which would run 2 queries regardless of memoizing). | |||||
* | | | | | Added Project.visible_to_user | Yorick Peterse | 2015-11-18 | 1 | -0/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This method can be used to filter projects to those visible to a given user. | |||||
* | | | | | Group methods for filtering public/visible groups | Yorick Peterse | 2015-11-18 | 1 | -0/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | These methods will be used to get a list of groups, optionally restricted to only those visible to a given user. | |||||
* | | | | | Added Event.limit_recent | Yorick Peterse | 2015-11-18 | 1 | -0/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This will be used to move some querying logic from the users controller to the Event model (where it belongs). |