Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'feature/label-subscription-api' into 'master' | Douwe Maan | 2016-05-12 | 3 | -0/+104 |
|\ | |||||
| * | Add API endpoints for un/subscribing from/to a label | Ahmad Sherif | 2016-05-12 | 3 | -0/+104 |
* | | Merge branch 'health-check-route' | Douwe Maan | 2016-05-12 | 4 | -0/+177 |
|\ \ | |/ |/| | |||||
| * | Support token header for health check token, and general cleanup of the healt... | DJ Mountney | 2016-05-11 | 1 | -0/+15 |
| * | Add tests for the health check feature | DJ Mountney | 2016-05-10 | 4 | -0/+162 |
* | | Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources' | Douwe Maan | 2016-05-12 | 2 | -1/+55 |
|\ \ | |||||
| * | | more readable specs for enabled_button_based_providers and button_based_provi... | Andrei Gliga | 2016-05-12 | 1 | -15/+29 |
| * | | DRYing enabled_button_based_providers tests | Andrei Gliga | 2016-05-12 | 1 | -7/+4 |
| * | | enabled_button_based_providers into their own describe section | Andrei Gliga | 2016-05-12 | 1 | -0/+2 |
| * | | use stub_application_setting instead | Andrei Gliga | 2016-05-12 | 1 | -10/+4 |
| * | | between "" | Andrei Gliga | 2016-05-12 | 1 | -1/+1 |
| * | | stub Devise.omniauth_providers to return GitHub even if the gitlab.yml has no... | Andrei Gliga | 2016-05-12 | 1 | -2/+8 |
| * | | tests for button_based_providers_enabled? helper method of AuthHelper | Andrei Gliga | 2016-05-12 | 1 | -0/+18 |
| * | | tests for enabled_button_based_providers helper method of AuthHelper | Andrei Gliga | 2016-05-12 | 1 | -1/+21 |
| * | | validate disabled_oauth_sign_in_sources in ApplicationSe | Andrei Gliga | 2016-05-12 | 1 | -0/+3 |
* | | | Merge branch 'send-incremental-build-log' into 'master' | Jacob Schatz | 2016-05-12 | 1 | -33/+78 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/master' into send-incremental-build-log | Kamil Trzcinski | 2016-05-10 | 62 | -893/+468 |
| |\ \ \ | |||||
| * | | | | Send trace to a browser incrementally when build is running | Kamil Trzcinski | 2016-05-09 | 1 | -33/+78 |
* | | | | | Removed tracking of total method execution timestotal-method-time | Yorick Peterse | 2016-05-12 | 1 | -6/+0 |
| |_|/ / |/| | | | |||||
* | | | | Implement @rymai's feedback after review. | Timothy Andrew | 2016-05-12 | 1 | -2/+10 |
* | | | | Add a spec for `WikiLinkFilter` | Timothy Andrew | 2016-05-12 | 1 | -0/+77 |
* | | | | Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master' | Douwe Maan | 2016-05-11 | 2 | -4/+59 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni... | Long Nguyen | 2016-05-11 | 64 | -894/+606 |
| |\ \ \ \ | |||||
| * | | | | | Add specs for user routing and update spec for user controller | Long Nguyen | 2016-05-08 | 2 | -0/+59 |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni... | Long Nguyen | 2016-05-08 | 8 | -29/+360 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | user routings refactor | Long Nguyen | 2016-05-08 | 1 | -0/+4 |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni... | Long Nguyen | 2016-05-05 | 62 | -410/+1660 |
| |\ \ \ \ \ | |||||
| * | | | | | | Remove unused code, update spec, and update changelog | Long Nguyen | 2016-05-05 | 1 | -8/+0 |
* | | | | | | | Merge branch 'hook-docs-behavior' into 'master' | Robert Speicher | 2016-05-11 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix test failures | Jacob Vosmaer | 2016-05-09 | 1 | -2/+2 |
* | | | | | | | | Merge branch '17249-starred' into 'master' | Robert Speicher | 2016-05-11 | 2 | -12/+28 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Tidy up user project specs | Sean McGivern | 2016-05-11 | 1 | -13/+8 |
| * | | | | | | | | Restrict starred projects to viewable ones | Sean McGivern | 2016-05-10 | 2 | -12/+33 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch '17270-only-generate-email-on-push-once-for-all-recipients' into... | Robert Speicher | 2016-05-11 | 3 | -45/+58 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Only generate repository push email once | Sean McGivern | 2016-05-11 | 3 | -45/+58 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'stanhu/gitlab-ce-add-eager-load-lib' into 'master' | Robert Speicher | 2016-05-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix a few places where autoloading would fail | Rémy Coutable | 2016-05-10 | 1 | -1/+1 |
* | | | | | | | | Fix an issue when filtering merge requests with more than one label | Rémy Coutable | 2016-05-10 | 1 | -0/+137 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'fix/using-uploads-in-global-snippets' into 'master' | Robert Speicher | 2016-05-10 | 1 | -0/+18 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Do not process upload links if no project context | Grzegorz Bizon | 2016-05-10 | 1 | -3/+3 |
| * | | | | | | Fix using link to uploads in global snippets | Grzegorz Bizon | 2016-05-10 | 1 | -0/+18 |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2016-05-10 | 53 | -886/+220 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch '2460-3690-support-multiline-tag-message' into 'master' | Rémy Coutable | 2016-05-10 | 4 | -0/+218 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Add integration specs for tags | Rémy Coutable | 2016-05-10 | 4 | -0/+218 |
| * | | | | | | | Merge branch 'revert-4026' into 'master' | Rémy Coutable | 2016-05-10 | 2 | -4/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Revert "Merge branch 'wiki-fix' into 'master' " | Rémy Coutable | 2016-05-10 | 2 | -4/+2 |
| * | | | | | | | Merge branch 'remove-annotate-gem' into 'master' | Yorick Peterse | 2016-05-10 | 47 | -882/+0 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Remove the annotate gem and delete old annotations | Jeroen van Baarsen | 2016-05-09 | 47 | -882/+0 |
* | | | | | | | | Use a case-insensitive comparison in sanitizing URI schemes | Stan Hu | 2016-05-09 | 1 | -0/+6 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'fix/todos-for-private-group-mentions' into 'master' | Douwe Maan | 2016-05-09 | 1 | -0/+19 |
|\ \ \ \ \ \ \ |