Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | reCAPTCHA is configurable through Admin Settings, no reload needed. | Gabriel Mazetto | 2015-12-28 | 1 | -10/+18 |
* | Merge branch 'disable-git-follow' into 'master' | Dmitriy Zaporozhets | 2015-12-28 | 1 | -1/+3 |
|\ | |||||
| * | Disable --follow in `git log` to avoid loading duplicate commit data in infin... | Stan Hu | 2015-12-25 | 1 | -1/+3 |
* | | Merge branch 'mention-all' into 'master' | Robert Speicher | 2015-12-27 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge branch 'master' into mention-all | Douwe Maan | 2015-12-24 | 2 | -8/+9 |
| |\ \ | | |/ | |||||
| * | | Only allow group/project members to mention `@all` | Douwe Maan | 2015-12-24 | 1 | -1/+1 |
* | | | Merge branch 'revert_votes_back' into 'master' | Dmitriy Zaporozhets | 2015-12-25 | 1 | -1/+8 |
|\ \ \ | |||||
| * | | | revert back vote buttons to issue and MR pages | Valery Sizov | 2015-12-25 | 1 | -1/+8 |
* | | | | Merge branch 'rs-opengraph' into 'master' | Douwe Maan | 2015-12-25 | 1 | -0/+8 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Add support for `twitter:label` meta tagsrs-opengraph | Robert Speicher | 2015-12-24 | 1 | -0/+8 |
* | | | | WIP require two factor authentication | Gabriel Mazetto | 2015-12-24 | 1 | -26/+33 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Robert Speicher | 2015-12-24 | 1 | -8/+8 |
|\ \ \ | |||||
| * \ \ | Merge pull request #9915 from huacnlee/avoid-ability-methods-allocations | Dmitriy Zaporozhets | 2015-12-24 | 1 | -8/+8 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Avoid allocations in Ability class. | Jason Lee | 2015-12-16 | 1 | -8/+8 |
* | | | | Merge branch 'ldap-special-chars-fix' into 'master' | Douwe Maan | 2015-12-24 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix identity and user retrieval when special characters are used | Patricio Cano | 2015-12-22 | 1 | -0/+1 |
* | | | | Merge branch 'fix-milestones-with-slashes' into 'master' | Dmitriy Zaporozhets | 2015-12-24 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix Error 500 when global milestones have slashes | Stan Hu | 2015-12-22 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'edit-on-fork' into 'master' | Dmitriy Zaporozhets | 2015-12-24 | 1 | -26/+33 |
|\ \ \ \ | |||||
| * | | | | Automatically fork a project when not allowed to edit a file. | Douwe Maan | 2015-12-18 | 1 | -26/+33 |
* | | | | | Merge branch 'fix/visibility-level-setting-in-forked-projects' into 'master' | Douwe Maan | 2015-12-24 | 1 | -3/+24 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Merge branch 'master' into fix/visibility-level-setting-in-forked-projects | Tomasz Maczukin | 2015-12-21 | 62 | -1336/+1089 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into fix/visibility-level-setting-in-forked-projects | Tomasz Maczukin | 2015-11-20 | 45 | -357/+627 |
| |\ \ \ \ \ | |||||
| * | | | | | | Change update_forks_visibility_level into after_update hook in Project model | Tomasz Maczukin | 2015-11-20 | 1 | -0/+13 |
| * | | | | | | Change forks method to has_many relation | Tomasz Maczukin | 2015-11-18 | 1 | -6/+5 |
| * | | | | | | Merge branch 'master' into fix/visibility-level-setting-in-forked-projects | Tomasz Maczukin | 2015-11-06 | 6 | -7/+15 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into fix/visibility-level-setting-in-forked-projects | Tomasz Maczukin | 2015-11-04 | 2 | -11/+11 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update forks visibility_level after parent project visibility_level change | Tomasz Maczukin | 2015-11-04 | 1 | -1/+5 |
| * | | | | | | | | Fix Project update service | Tomasz Maczukin | 2015-11-03 | 1 | -1/+1 |
| * | | | | | | | | Move visibility_level check for forked projects to Project model | Tomasz Maczukin | 2015-11-03 | 1 | -0/+5 |
* | | | | | | | | | Use method that creates runners registration token | Grzegorz Bizon | 2015-12-23 | 2 | -1/+4 |
* | | | | | | | | | Add method that persist ensured token in `TokenAuthenticatable` | Grzegorz Bizon | 2015-12-23 | 1 | -2/+13 |
* | | | | | | | | | Fix method that ensures authentication token | Grzegorz Bizon | 2015-12-23 | 1 | -6/+2 |
| |_|_|_|_|_|/ / |/| | | | | | | | |||||
* | | | | | | | | Deprecate GitLabCiService making it to always be inactive | Kamil Trzcinski | 2015-12-22 | 1 | -1/+6 |
* | | | | | | | | Merge branch 'fix-issue-related-mrs' into 'master' | Robert Speicher | 2015-12-21 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix issue related cross-project MRsfix-issue-related-mrs | Douwe Maan | 2015-12-21 | 2 | -2/+2 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'add_email_unlock' into 'master' | Robert Speicher | 2015-12-21 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Allow account unlock via email | Drew Blessing | 2015-12-14 | 1 | -0/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'issue_3452' | Douwe Maan | 2015-12-21 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add link to MR from Build detail page. #3452 | Rubén Dávila | 2015-12-16 | 1 | -0/+10 |
* | | | | | | | | | Merge branch 'coverage-regex' into 'master' | Douwe Maan | 2015-12-21 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix build coverage regex. | Jared Szechy | 2015-12-20 | 1 | -1/+2 |
| * | | | | | | | | | Fix build coverage regex matching to allow captures. | Jared Szechy | 2015-12-17 | 1 | -1/+1 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Backport JIRA service | Drew Blessing | 2015-12-18 | 4 | -2/+251 |
| |_|_|/ / / / / |/| | | | | | | | |||||
* | | | | | | | | Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the... | Kamil Trzcinski | 2015-12-17 | 1 | -10/+0 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'reference-cache' into 'master' | Robert Speicher | 2015-12-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Only cache markdown when object has been saved and has a proper cache_key. | Douwe Maan | 2015-12-16 | 1 | -1/+1 |
* | | | | | | | Fix bad merge | Stan Hu | 2015-12-16 | 1 | -1/+0 |
* | | | | | | | Merge branch 'add-open-issues-count-to-api' of https://gitlab.com/stanhu/gitl... | Dmitriy Zaporozhets | 2015-12-16 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add open_issues_count to project API | Stan Hu | 2015-12-11 | 1 | -0/+4 |