Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use cache for todos counter calling TodoServiceuse-todos-finder-cached-data | Paco Guzman | 2016-07-08 | 5 | -5/+18 |
* | Merge branch 'retrieve-mr-closes-issues-just-when-required' into 'master' | Rémy Coutable | 2016-07-08 | 4 | -9/+8 |
|\ | |||||
| * | Avoid calculation of closes_issues.retrieve-mr-closes-issues-just-when-required | Paco Guzman | 2016-07-07 | 4 | -9/+8 |
* | | Merge branch 'fix-broken-mysql-migration' into 'master' | Robert Speicher | 2016-07-08 | 1 | -2/+2 |
|\ \ | |||||
| * | | Fix missing quote_table_name | Stan Hu | 2016-06-29 | 1 | -1/+1 |
| * | | Fix broken migration in MySQL | Stan Hu | 2016-06-29 | 1 | -1/+1 |
* | | | Merge branch 'edgemaster/gitlab-ce-patch-missing-api-docs' | Rémy Coutable | 2016-07-08 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | API Docs: Add missing project option shared_runners_enabled | Thomas Wood | 2016-05-09 | 1 | -0/+3 |
* | | | | Merge branch 'clarify-github-integration-docs' into 'master' | Rémy Coutable | 2016-07-08 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix documentation for Github integration authorization callback url. | Eric K Idema | 2016-05-10 | 1 | -1/+1 |
* | | | | | Merge branch 'fix-changelog-typo' into 'master' | Stan Hu | 2016-07-08 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix CHANGELOG typo: by_pass -> bypass | Stan Hu | 2016-07-01 | 1 | -1/+1 |
* | | | | | | Merge branch 'yatish27/gitlab-ce-project-commit-range-comment' into 'master' | Rémy Coutable | 2016-07-08 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix comment for project argument in commit_range.rb | Yatish Mehta | 2016-06-20 | 1 | -2/+2 |
* | | | | | | | Merge branch '1548-average-commits-per-day' into 'master' | Rémy Coutable | 2016-07-08 | 2 | -1/+40 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Infinity Bug in Commit Statistics | Jonas Weber | 2016-05-20 | 2 | -1/+40 |
* | | | | | | | | Merge branch 'dont-render-discussion-notes-on-not-html-requests' | Douwe Maan | 2016-07-08 | 3 | -24/+35 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Don't render discussion notes when requesting diff tab through AJAXdont-render-discussion-notes-on-not-html-requests | Paco Guzman | 2016-07-08 | 3 | -24/+35 |
* | | | | | | | | | Merge branch 'patch-1' into 'master' | Rémy Coutable | 2016-07-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fixed Typo in README.md | Philipp Kraus | 2016-06-01 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'api-shared-projects' into 'master' | Rémy Coutable | 2016-07-08 | 6 | -46/+310 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | API: Expose shared projects in a groupapi-shared-projects | Robert Schilling | 2016-07-08 | 4 | -4/+193 |
| * | | | | | | | | | | Expose shared groups for projectsapi-shared-groups | Robert Schilling | 2016-07-08 | 5 | -43/+118 |
* | | | | | | | | | | | Merge branch 'memoize_merge_request_events' into 'master' | Rémy Coutable | 2016-07-08 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Memoize MR merged/closed events retrievalmemoize_merge_request_events | Paco Guzman | 2016-07-08 | 2 | -2/+3 |
* | | | | | | | | | | | | Merge pull request #10368 from gsmetal/patch-1 | Robert Schilling | 2016-07-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix unarchive mistake | Sergey Gnuskov | 2016-07-07 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'fix/import-url-migration' into 'master' | Rémy Coutable | 2016-07-08 | 1 | -6/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | fix thread join issuefix/import-url-migration | James Lopez | 2016-07-08 | 1 | -4/+2 |
| * | | | | | | | | | | | | import_url migration performance improvements | James Lopez | 2016-07-08 | 1 | -6/+28 |
* | | | | | | | | | | | | | Merge branch 'feature/option-set-new-users-external' into 'master' | Rémy Coutable | 2016-07-08 | 10 | -1/+50 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Added setting to set new users by default as external | Dravere | 2016-07-07 | 10 | -1/+50 |
* | | | | | | | | | | | | | | Merge branch '9127-link-report-to-profile' into 'master' | Robert Speicher | 2016-07-08 | 3 | -2/+37 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Removed unnecessary `id` from links and corrected tests to use the proper mat...9127-link-report-to-profile | Patricio Cano | 2016-07-07 | 3 | -6/+5 |
| * | | | | | | | | | | | | | Added specs to check for the correct links. | Patricio Cano | 2016-07-06 | 3 | -2/+33 |
| * | | | | | | | | | | | | | Link to the user's profile in the abuse reports and add a link to the admin a... | Patricio Cano | 2016-07-06 | 2 | -2/+7 |
* | | | | | | | | | | | | | | Revert "Revert "Merge branch 'issue_3946' into 'master' "" | Robert Speicher | 2016-07-07 | 21 | -296/+399 |
* | | | | | | | | | | | | | | Merge branch 'upgrade-oauth2' into 'master' | Robert Speicher | 2016-07-07 | 2 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Upgrade oauth2 from 1.0.0 to 1.2.0.upgrade-oauth2 | Connor Shea | 2016-07-01 | 2 | -6/+6 |
* | | | | | | | | | | | | | | | Merge branch 'prefer-scope' into 'master' | Douwe Maan | 2016-07-07 | 1 | -4/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Use scope rather than class methodprefer-scope | Lin Jen-Shin | 2016-07-07 | 1 | -4/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'prefer-ref' into 'master' | Douwe Maan | 2016-07-07 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Also use ref in Repository#commitprefer-ref | Lin Jen-Shin | 2016-07-07 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | Prefer ref rather than id because id is shadowing database id | Lin Jen-Shin | 2016-07-07 | 1 | -2/+2 |
| |/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' | Robert Speicher | 2016-07-07 | 24 | -70/+585 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '18627-wildcard-branch-protection' into 'master' | Douwe Maan | 2016-07-07 | 24 | -70/+585 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Have `Project#open_branches` return branches that are matched by a wildcard p...18627-wildcard-branch-protection | Timothy Andrew | 2016-07-07 | 3 | -4/+8 |
| | * | | | | | | | | | | | | | | | Use the `GLDropdown` component to select protected branches. | Timothy Andrew | 2016-07-07 | 6 | -11/+65 |
| | * | | | | | | | | | | | | | | | Add wildcard protected branches to the CHANGELOG. | Timothy Andrew | 2016-07-06 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | Add documentation for wildcard protected branches. | Timothy Andrew | 2016-07-05 | 5 | -3/+28 |