summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* reCAPTCHA is configurable through Admin Settings, no reload needed.Gabriel Mazetto2015-12-281-10/+18
* Merge branch 'disable-git-follow' into 'master' Dmitriy Zaporozhets2015-12-281-1/+3
|\
| * Disable --follow in `git log` to avoid loading duplicate commit data in infin...Stan Hu2015-12-251-1/+3
* | Merge branch 'mention-all' into 'master' Robert Speicher2015-12-271-1/+1
|\ \
| * \ Merge branch 'master' into mention-allDouwe Maan2015-12-242-8/+9
| |\ \ | | |/
| * | Only allow group/project members to mention `@all`Douwe Maan2015-12-241-1/+1
* | | Merge branch 'revert_votes_back' into 'master' Dmitriy Zaporozhets2015-12-251-1/+8
|\ \ \
| * | | revert back vote buttons to issue and MR pagesValery Sizov2015-12-251-1/+8
* | | | Merge branch 'rs-opengraph' into 'master' Douwe Maan2015-12-251-0/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Add support for `twitter:label` meta tagsrs-opengraphRobert Speicher2015-12-241-0/+8
* | | | WIP require two factor authenticationGabriel Mazetto2015-12-241-26/+33
| |_|/ |/| |
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Speicher2015-12-241-8/+8
|\ \ \
| * \ \ Merge pull request #9915 from huacnlee/avoid-ability-methods-allocationsDmitriy Zaporozhets2015-12-241-8/+8
| |\ \ \ | | |_|/ | |/| |
| | * | Avoid allocations in Ability class.Jason Lee2015-12-161-8/+8
* | | | Merge branch 'ldap-special-chars-fix' into 'master' Douwe Maan2015-12-241-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix identity and user retrieval when special characters are usedPatricio Cano2015-12-221-0/+1
* | | | Merge branch 'fix-milestones-with-slashes' into 'master' Dmitriy Zaporozhets2015-12-241-1/+1
|\ \ \ \
| * | | | Fix Error 500 when global milestones have slashesStan Hu2015-12-221-1/+1
| |/ / /
* | | | Merge branch 'edit-on-fork' into 'master' Dmitriy Zaporozhets2015-12-241-26/+33
|\ \ \ \
| * | | | Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-181-26/+33
* | | | | Merge branch 'fix/visibility-level-setting-in-forked-projects' into 'master' Douwe Maan2015-12-241-3/+24
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-12-2162-1336/+1089
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-2045-357/+627
| |\ \ \ \ \
| * | | | | | Change update_forks_visibility_level into after_update hook in Project modelTomasz Maczukin2015-11-201-0/+13
| * | | | | | Change forks method to has_many relationTomasz Maczukin2015-11-181-6/+5
| * | | | | | Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-066-7/+15
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-042-11/+11
| |\ \ \ \ \ \ \
| * | | | | | | | Update forks visibility_level after parent project visibility_level changeTomasz Maczukin2015-11-041-1/+5
| * | | | | | | | Fix Project update serviceTomasz Maczukin2015-11-031-1/+1
| * | | | | | | | Move visibility_level check for forked projects to Project modelTomasz Maczukin2015-11-031-0/+5
* | | | | | | | | Use method that creates runners registration tokenGrzegorz Bizon2015-12-232-1/+4
* | | | | | | | | Add method that persist ensured token in `TokenAuthenticatable`Grzegorz Bizon2015-12-231-2/+13
* | | | | | | | | Fix method that ensures authentication tokenGrzegorz Bizon2015-12-231-6/+2
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Deprecate GitLabCiService making it to always be inactiveKamil Trzcinski2015-12-221-1/+6
* | | | | | | | Merge branch 'fix-issue-related-mrs' into 'master' Robert Speicher2015-12-212-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix issue related cross-project MRsfix-issue-related-mrsDouwe Maan2015-12-212-2/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'add_email_unlock' into 'master' Robert Speicher2015-12-211-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow account unlock via emailDrew Blessing2015-12-141-0/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'issue_3452'Douwe Maan2015-12-211-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Add link to MR from Build detail page. #3452Rubén Dávila2015-12-161-0/+10
* | | | | | | | | Merge branch 'coverage-regex' into 'master' Douwe Maan2015-12-211-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix build coverage regex.Jared Szechy2015-12-201-1/+2
| * | | | | | | | | Fix build coverage regex matching to allow captures.Jared Szechy2015-12-171-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Backport JIRA serviceDrew Blessing2015-12-184-2/+251
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the...Kamil Trzcinski2015-12-171-10/+0
|/ / / / / / /
* | | | | | | Merge branch 'reference-cache' into 'master' Robert Speicher2015-12-161-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Only cache markdown when object has been saved and has a proper cache_key.Douwe Maan2015-12-161-1/+1
* | | | | | | Fix bad mergeStan Hu2015-12-161-1/+0
* | | | | | | Merge branch 'add-open-issues-count-to-api' of https://gitlab.com/stanhu/gitl...Dmitriy Zaporozhets2015-12-161-0/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add open_issues_count to project APIStan Hu2015-12-111-0/+4