summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add Changelog entryhealth-check-routeDJ Mountney2016-05-123-11/+8
* Support token header for health check token, and general cleanup of the healt...DJ Mountney2016-05-115-20/+50
* Add tests for the health check featureDJ Mountney2016-05-105-0/+165
* Add health_check access token, and enforce on the health_check endpointDJ Mountney2016-05-109-2/+89
* Set the standard health_check options to include the cache check.DJ Mountney2016-05-101-28/+3
* Add the health_check gem end expose the health_check routeDJ Mountney2016-05-104-0/+37
* Change dashboard button color to white on hoverDmitriy Zaporozhets2016-05-101-0/+4
* Minor consistency fixes to sidebar & headerDmitriy Zaporozhets2016-05-102-2/+2
* Merge branch 'mobile-navigation-redesign' into 'master' Dmitriy Zaporozhets2016-05-108-9/+108
|\
| * Fix media queries for absolutely positioned nav elementAnnabel Dunstone2016-05-093-4/+14
| * Hide navbar on mobileAnnabel Dunstone2016-05-097-6/+95
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-10145-2734/+232
|\ \
| * \ Merge branch '2460-3690-support-multiline-tag-message' into 'master' Rémy Coutable2016-05-109-142/+223
| |\ \
| | * | Add integration specs for tagsRémy Coutable2016-05-108-137/+219
| | * | Replace text field with textarea in 'New Tag' view and display tag message in...Calin Seciu2016-05-102-5/+4
| * | | Merge branch 'revert-4026' into 'master' Rémy Coutable2016-05-105-7/+4
| |\ \ \ | | |/ / | |/| |
| | * | Revert "Merge branch 'wiki-fix' into 'master' "Rémy Coutable2016-05-105-7/+4
| * | | Merge branch 'remove-annotate-gem' into 'master' Yorick Peterse2016-05-10131-2585/+1
| |\ \ \ | | |/ / | |/| |
| | * | Remove the annotate rake taskJeroen van Baarsen2016-05-101-44/+0
| | * | Remove the annotate gem and delete old annotationsJeroen van Baarsen2016-05-09130-2541/+1
| * | | Merge branch 'fix-link-to-redmine-issues' into 'master' Robert Speicher2016-05-102-0/+4
| |\ \ \
| | * | | Links for redmine issue references are generated correctly againBenedikt Huss2016-05-102-0/+4
* | | | | Merge branch 'xss-case-insensitive-protocol' into 'master' Robert Speicher2016-05-093-1/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use a case-insensitive comparison in sanitizing URI schemesStan Hu2016-05-093-1/+8
| |/ / /
* | | | Merge branch 'revert-450ea01d' into 'master' Achilleas Pipinellis2016-05-091-5/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Merge branch 'patch-1' into 'master'"Rémy Coutable2016-05-091-5/+5
| |/ /
* | | Merge branch 'fix/todos-for-private-group-mentions' into 'master' Douwe Maan2016-05-093-2/+22
|\ \ \
| * | | Fix adding a todo for private group membersAhmad Sherif2016-05-073-2/+22
* | | | Merge branch 'cascade_drop' into 'master' Robert Speicher2016-05-091-1/+3
|\ \ \ \
| * | | | Add if exists to drop commandDrew Blessing2016-05-091-1/+3
* | | | | Merge branch 'issue_15394' into 'master' Rémy Coutable2016-05-096-1/+26
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Make model sanitization methods one linersFelipe Artur2016-05-093-6/+5
| * | | | Sanitize milestones and label titlesissue_15394Felipe Artur2016-05-055-1/+27
* | | | | Merge branch '2954-api-expose-issue-user_notes_count' into 'master' Rémy Coutable2016-05-099-34/+89
|\ \ \ \ \
| * | | | | Expose MergeRequest#user_notes_count in the API and use the method in issues ...Rémy Coutable2016-05-097-45/+73
| * | | | | API: Expose Issue#user_notes_countcnam-dep2016-05-095-6/+33
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rs-backport-ee-372' into 'master' Rémy Coutable2016-05-096-48/+80
|\ \ \ \ \
| * | | | | Backport changes from gitlab-org/gitlab-ee!372rs-backport-ee-372Robert Speicher2016-05-046-48/+80
| | |/ / / | |/| | |
* | | | | Merge branch 'fix-secret' into 'master' Rémy Coutable2016-05-091-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Don't read otp_secret_encryption_key from hardcoded path in models/userJakub Jirutka2016-05-041-1/+1
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-0938-81/+574
|\ \ \ \ \
| * \ \ \ \ Merge branch 'document-adding-instrumentation' into 'master' Rémy Coutable2016-05-091-6/+123
| |\ \ \ \ \
| | * | | | | Added documentation on how to instrument methodsdocument-adding-instrumentationYorick Peterse2016-05-051-6/+123
| * | | | | | Merge branch 'wiki-fix' into 'master' Rémy Coutable2016-05-095-4/+7
| |\ \ \ \ \ \
| | * | | | | | Use the proper GitLab URL for links in WikiArtem Sidorenko2016-05-095-4/+7
| * | | | | | | Merge branch 'rs-remove-wall_enabled' into 'master' Dmitriy Zaporozhets2016-05-096-7/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Remove `wall_enabled` field from Projectrs-remove-wall_enabledRobert Speicher2016-05-086-7/+6
| * | | | | | | Merge branch 'improve-multiple-branch-push-performance' into 'master' Yorick Peterse2016-05-093-2/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Improve multiple branch push performance by memoizing permission checkingStan Hu2016-05-093-2/+8
| * | | | | | | | Merge branch 'trusted-proxies-ip-addr' into 'master' Rémy Coutable2016-05-092-1/+53
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |