summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Clean up LegacyDiffNote somewhatDouwe Maan2016-05-132-98/+77
* Extract LegacyDiffNote out of NoteDouwe Maan2016-05-132-184/+212
* Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-133-4/+4
* Merge branch 'deprecated-class-methods-cop' into 'master' Robert Speicher2016-05-122-2/+2
|\
| * Enable the Rubocop DeprecatedClassMethods copConnor Shea2016-05-082-2/+2
* | Merge branch 'feature/label-subscription-api' into 'master' Douwe Maan2016-05-121-0/+6
|\ \
| * | Add API endpoints for un/subscribing from/to a labelAhmad Sherif2016-05-121-0/+6
* | | Merge branch 'health-check-route'Douwe Maan2016-05-121-0/+6
|\ \ \ | |/ / |/| |
| * | Add health_check access token, and enforce on the health_check endpointDJ Mountney2016-05-101-0/+6
* | | Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources'Douwe Maan2016-05-121-0/+12
|\ \ \
| * | | no schema info for ApplicationSettingAndrei Gliga2016-05-121-49/+0
| * | | typoAndrei Gliga2016-05-121-1/+1
| * | | validate disabled_oauth_sign_in_sources in ApplicationSeAndrei Gliga2016-05-121-0/+10
| * | | default value for disabled_oauth_sign_in_sources in create_from_defaults @ Ap...Andrei Gliga2016-05-121-0/+1
| * | | serialize the disabled_oauth_sign_in_sourcesAndrei Gliga2016-05-121-0/+50
* | | | Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz2016-05-121-2/+6
|\ \ \ \
| * | | | Fix specssend-incremental-build-logKamil Trzcinski2016-05-121-1/+1
| * | | | Merge remote-tracking branch 'origin/master' into send-incremental-build-logKamil Trzcinski2016-05-1083-1659/+16
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Send trace to a browser incrementally when build is runningKamil Trzcinski2016-05-091-2/+6
| | |_|/ | |/| |
* | | | Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master' Rémy Coutable2016-05-121-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use % notation for arrays in runner model constantsfix/reuse-runner-edit-form-in-admin-areaGrzegorz Bizon2016-05-111-2/+2
| * | | Share form editable attributes mf runner via modelGrzegorz Bizon2016-05-101-0/+1
* | | | Merge branch 'hook-docs-behavior' into 'master' Robert Speicher2016-05-111-1/+1
|\ \ \ \
| * | | | Remove extra sanitizationJacob Vosmaer2016-05-101-1/+1
| * | | | Improve documentation and web test for web hooksJacob Vosmaer2016-05-031-1/+1
* | | | | Merge branch '17249-starred' into 'master' Robert Speicher2016-05-111-0/+5
|\ \ \ \ \
| * | | | | Tidy up user project specsSean McGivern2016-05-111-1/+1
| * | | | | Restrict starred projects to viewable onesSean McGivern2016-05-101-0/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'casecmp-cop' into 'master' Rémy Coutable2016-05-111-1/+1
|\ \ \ \ \
| * | | | | Enable Rubocop Casecmp Performance Cop.Connor Shea2016-05-101-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'stanhu/gitlab-ce-add-eager-load-lib' into 'master' Robert Speicher2016-05-101-1/+1
|\ \ \ \ \
| * | | | | Fix a few places where autoloading would failRémy Coutable2016-05-101-1/+1
| | |/ / / | |/| | |
* | | | | Fix an issue when filtering merge requests with more than one labelRémy Coutable2016-05-101-2/+2
|/ / / /
* | | | Merge branch 'revert-4026' into 'master' Rémy Coutable2016-05-101-1/+1
|\ \ \ \
| * | | | Revert "Merge branch 'wiki-fix' into 'master' "Rémy Coutable2016-05-101-1/+1
* | | | | Merge branch 'remove-annotate-gem' into 'master' Yorick Peterse2016-05-1081-1653/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove the annotate gem and delete old annotationsJeroen van Baarsen2016-05-0981-1653/+0
* | | | | Merge branch 'fix/todos-for-private-group-mentions' into 'master' Douwe Maan2016-05-091-2/+2
|\ \ \ \ \
| * | | | | Fix adding a todo for private group membersAhmad Sherif2016-05-071-2/+2
* | | | | | Merge branch 'issue_15394' into 'master' Rémy Coutable2016-05-092-0/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Make model sanitization methods one linersFelipe Artur2016-05-092-6/+4
| * | | | | Sanitize milestones and label titlesissue_15394Felipe Artur2016-05-052-0/+10
* | | | | | Merge branch '2954-api-expose-issue-user_notes_count' into 'master' Rémy Coutable2016-05-091-0/+4
|\ \ \ \ \ \
| * | | | | | API: Expose Issue#user_notes_countcnam-dep2016-05-091-0/+4
| | |_|_|_|/ | |/| | | |
* | | | | | 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 'wiki-fix' into 'master' Rémy Coutable2016-05-091-1/+1
|\ \ \ \ \
| * | | | | Use the proper GitLab URL for links in WikiArtem Sidorenko2016-05-091-1/+1
* | | | | | Merge branch 'rs-remove-wall_enabled' into 'master' Dmitriy Zaporozhets2016-05-091-2/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove `wall_enabled` field from Projectrs-remove-wall_enabledRobert Speicher2016-05-081-2/+0
| | |_|/ / | |/| | |