summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Run bundle install.update-gemfileConnor Shea2016-07-081-15/+15
* Merge branch 'improve-project-limit-field' into 'master' Rémy Coutable2016-07-082-1/+2
|\
| * Add min attribute to project_limit field on user's formAndrey Krivko2016-07-082-1/+2
* | Merge branch 'fix_gemfile' into 'master' Rémy Coutable2016-07-081-50/+50
|\ \
| * | set version for gems.bogdanvlviv2016-07-041-15/+15
| * | change `require: nil` to `require: false`bogdanvlviv2016-07-041-1/+1
| * | replace " to ' in Gemfilebogdanvlviv2016-07-041-36/+36
* | | Merge branch 'rubocop/enable-identical-conditional-branches-cop' into 'master' Robert Speicher2016-07-085-30/+13
|\ \ \
| * | | Remove legacy conditional from irker service coderubocop/enable-identical-conditional-branches-copGrzegorz Bizon2016-07-081-8/+0
| * | | Enable Style/IdenticalConditionalBranches Rubocop copGrzegorz Bizon2016-07-085-23/+14
* | | | Merge branch 'retrieve-mr-closes-issues-just-when-required' into 'master' Rémy Coutable2016-07-084-9/+8
|\ \ \ \
| * | | | Avoid calculation of closes_issues.retrieve-mr-closes-issues-just-when-requiredPaco Guzman2016-07-074-9/+8
* | | | | Merge branch 'fix-broken-mysql-migration' into 'master' Robert Speicher2016-07-081-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix missing quote_table_nameStan Hu2016-06-291-1/+1
| * | | | Fix broken migration in MySQLStan Hu2016-06-291-1/+1
* | | | | Merge branch 'edgemaster/gitlab-ce-patch-missing-api-docs'Rémy Coutable2016-07-081-0/+3
|\ \ \ \ \
| * | | | | API Docs: Add missing project option shared_runners_enabledThomas Wood2016-05-091-0/+3
* | | | | | Merge branch 'clarify-github-integration-docs' into 'master' Rémy Coutable2016-07-081-1/+1
|\ \ \ \ \ \
| * | | | | | Fix documentation for Github integration authorization callback url.Eric K Idema2016-05-101-1/+1
* | | | | | | Merge branch 'fix-changelog-typo' into 'master' Stan Hu2016-07-081-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix CHANGELOG typo: by_pass -> bypassStan Hu2016-07-011-1/+1
* | | | | | | | Merge branch 'yatish27/gitlab-ce-project-commit-range-comment' into 'master' Rémy Coutable2016-07-081-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix comment for project argument in commit_range.rbYatish Mehta2016-06-201-2/+2
* | | | | | | | | Merge branch '1548-average-commits-per-day' into 'master' Rémy Coutable2016-07-082-1/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Infinity Bug in Commit StatisticsJonas Weber2016-05-202-1/+40
* | | | | | | | | | Merge branch 'dont-render-discussion-notes-on-not-html-requests'Douwe Maan2016-07-083-24/+35
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't render discussion notes when requesting diff tab through AJAXdont-render-discussion-notes-on-not-html-requestsPaco Guzman2016-07-083-24/+35
* | | | | | | | | | | Merge branch 'patch-1' into 'master' Rémy Coutable2016-07-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed Typo in README.mdPhilipp Kraus2016-06-011-1/+1
* | | | | | | | | | | | Merge branch 'api-shared-projects' into 'master' Rémy Coutable2016-07-086-46/+310
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | API: Expose shared projects in a groupapi-shared-projectsRobert Schilling2016-07-084-4/+193
| * | | | | | | | | | | | Expose shared groups for projectsapi-shared-groupsRobert Schilling2016-07-085-43/+118
* | | | | | | | | | | | | Merge branch 'memoize_merge_request_events' into 'master' Rémy Coutable2016-07-082-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Memoize MR merged/closed events retrievalmemoize_merge_request_eventsPaco Guzman2016-07-082-2/+3
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #10368 from gsmetal/patch-1Robert Schilling2016-07-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix unarchive mistakeSergey Gnuskov2016-07-071-1/+1
* | | | | | | | | | | | | | Merge branch 'fix/import-url-migration' into 'master' Rémy Coutable2016-07-081-6/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | fix thread join issuefix/import-url-migrationJames Lopez2016-07-081-4/+2
| * | | | | | | | | | | | | import_url migration performance improvementsJames Lopez2016-07-081-6/+28
* | | | | | | | | | | | | | Merge branch 'feature/option-set-new-users-external' into 'master' Rémy Coutable2016-07-0810-1/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Added setting to set new users by default as externalDravere2016-07-0710-1/+50
* | | | | | | | | | | | | | | Merge branch '9127-link-report-to-profile' into 'master' Robert Speicher2016-07-083-2/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Removed unnecessary `id` from links and corrected tests to use the proper mat...9127-link-report-to-profilePatricio Cano2016-07-073-6/+5
| * | | | | | | | | | | | | | Added specs to check for the correct links.Patricio Cano2016-07-063-2/+33
| * | | | | | | | | | | | | | Link to the user's profile in the abuse reports and add a link to the admin a...Patricio Cano2016-07-062-2/+7
* | | | | | | | | | | | | | | Revert "Revert "Merge branch 'issue_3946' into 'master' ""Robert Speicher2016-07-0721-296/+399
* | | | | | | | | | | | | | | Merge branch 'upgrade-oauth2' into 'master' Robert Speicher2016-07-072-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Upgrade oauth2 from 1.0.0 to 1.2.0.upgrade-oauth2Connor Shea2016-07-012-6/+6
* | | | | | | | | | | | | | | | Merge branch 'prefer-scope' into 'master' Douwe Maan2016-07-071-4/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Use scope rather than class methodprefer-scopeLin Jen-Shin2016-07-071-4/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |