summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed typos in migration templatesmigration-helpersYorick Peterse2016-05-192-2/+2
* Remove left-over use of strip_heredocYorick Peterse2016-05-191-1/+1
* Removed stray strip_heredoc from migration helpersYorick Peterse2016-05-131-1/+1
* Fixed styling per Rubocop pedanticsYorick Peterse2016-05-122-5/+7
* Tell Rubocop to ignore lib/templatesYorick Peterse2016-05-121-1/+2
* Link to migration guide in migration templatesYorick Peterse2016-05-122-0/+6
* Updated migration styleguide for new helpersYorick Peterse2016-05-121-2/+44
* Added custom migration generator templatesYorick Peterse2016-05-122-0/+84
* Added helper methods for database migrationsYorick Peterse2016-05-122-0/+256
* 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 '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
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Add tests for setting trusted_proxiestrusted-proxies-ip-addrDJ Mountney2016-05-041-0/+51
| | * | | | | | | Pass trusted_proxies to action_dispatch as IPAddrs instead of stringsDJ Mountney2016-04-281-1/+2
| * | | | | | | | Merge branch 'escape-commit-titles' into 'master' Robert Speicher2016-05-083-1/+15
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Escape HTML in commit titles in system note messagesStan Hu2016-05-073-1/+15
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'fix-build-notification-on-merge-page-change' into 'master' Stan Hu2016-05-084-10/+15
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix build notification on merge request page change even if the build status ...Benedikt Huss2016-05-084-10/+15
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'docs/adapt-user-api' into 'master' Achilleas Pipinellis2016-05-081-22/+58
| |\ \ \ \ \ \ \ \
| | * | | | | | | | docs(api): adapted user API documentation to match with latest APIFabio Huser2016-05-061-22/+58
| * | | | | | | | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-05-081-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | blost -> blogBen Bodenmiller2016-05-061-1/+1
| * | | | | | | | | | Merge branch 'update-doc-ci-examples' into 'master' Achilleas Pipinellis2016-05-083-9/+9
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Update CI example docs.Takuya Noguchi2016-05-073-9/+9
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'update-docker-hub-link' into 'master' Achilleas Pipinellis2016-05-087-17/+17
| |\ \ \ \ \ \ \ \ \ \