summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ipython-notebook-viewer-improvements' into 'master' Jacob Schatz2017-03-301-1/+1
|\
| * Added worksheets support to notebook viewerPhil Hughes2017-03-301-1/+1
* | Merge branch '24784-system-notes-meta-data' into 'master' Sean McGivern2017-03-302-1/+15
|\ \ | |/ |/|
| * Create metadata when creating system notesJarka Kadlecova2017-03-282-2/+2
| * Add system_note_metadata modelJarka Kadlecova2017-03-282-1/+15
* | Merge branch '29843-project-subgroup-transfer' into 'security'Rémy Coutable2017-03-291-9/+9
* | Merge branch 'optimistic-locking-ci-status-change' into 'master' Rémy Coutable2017-03-291-0/+4
|\ \
| * | Make CI build to use optimistic locking only on status changeKamil Trzcinski2017-03-281-0/+4
* | | Merge branch 'ipython-notebook-viewer' into 'master' Jacob Schatz2017-03-281-0/+6
|\ \ \
| * | | Started iPython notebook viewerPhil Hughes2017-03-231-0/+6
| |/ /
* | | Support wider range of monitored environments with PrometheusJoshua Lambert2017-03-281-3/+3
| |/ |/|
* | Merge branch 'rename_done_to_closed' into 'master' Sean McGivern2017-03-272-3/+3
|\ \
| * | Change Done column to Closed in issue boardsblackst0ne2017-03-242-3/+3
* | | Merge branch 'sh-bring-back-option-to-be-notified-of-own-activity' into 'mast...Robert Speicher2017-03-271-0/+1
|\ \ \
| * | | Use default_value_for to set notified_of_own_activity instead of using a DB m...Stan Hu2017-03-241-0/+1
* | | | Implement new service for creating userGeorge Andrinopoulos2017-03-271-18/+3
* | | | Merge branch '29116-maxint-error' into 'master' Rémy Coutable2017-03-261-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Fix projects_limit RangeError on user createAlexander Randa2017-03-241-1/+3
| |/ /
* | | Merge branch '22145-slow-search' into 'master' Yorick Peterse2017-03-242-11/+8
|\ \ \
| * | | simplify projects, mrs search queriesmhasbini2017-03-222-11/+8
* | | | Add dropdown sort to project milestonesGeorge Andrinopoulos2017-03-241-0/+15
| |/ / |/| |
* | | Merge branch 'zj-chat-notification-default-branch' into 'master' Rémy Coutable2017-03-233-25/+34
|\ \ \
| * | | Improve readability and add testZ.J. van de Weg2017-03-231-10/+7
| * | | Allow chat notifications only for the default branchZ.J. van de Weg2017-03-223-25/+37
| | |/ | |/|
* | | Don't try to find a user by personal_access_token if the token is nilRémy Coutable2017-03-221-0/+2
|/ /
* | Merge branch '29483-spam-check-only-title-and-description' into 'master' Sean McGivern2017-03-223-4/+4
|\ \
| * | Spam check only when spammable attributes have changedOswaldo Ferreira2017-03-212-3/+3
| * | Present ajax call errors when failing to update an IssueOswaldo Ferreira2017-03-211-1/+1
* | | Merge branch 'revert-37328406' into 'master' Rémy Coutable2017-03-211-1/+4
|\ \ \
| * | | Revert "Merge branch '29534-todos-performance' into 'master'"Sean McGivern2017-03-211-1/+4
* | | | Merge branch '29583-routes-like-fix' into 'master' Sean McGivern2017-03-213-3/+5
|\ \ \ \
| * | | | Escape route path for LIKE queriesJarka Kadlecova2017-03-213-3/+5
* | | | | Merge branch 'jej-backport-authorless-fix' into 'master' Douwe Maan2017-03-211-0/+1
|\ \ \ \ \
| * | | | | Prevented error on nil author from Issuable delegationJames Edwards-Jones2017-03-211-0/+1
| |/ / / /
* | | | | Resolve "Fix the Prometheus queries for multiple container environments"Jose Ivan Vargas Lopez2017-03-211-4/+4
| |/ / / |/| | |
* | | | Merge branch 'dz-hide-share-group-ancestors' into 'master' Douwe Maan2017-03-211-1/+1
|\ \ \ \
| * | | | Hide ancestor groups in the share group dropdown listdz-hide-share-group-ancestorsDmitriy Zaporozhets2017-03-211-1/+1
* | | | | Merge branch '29618-clarify-help-text-on-prometheus-integration-page' into 'm...Douwe Maan2017-03-211-1/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Move text to a MD heredoc.Joshua Lambert2017-03-211-1/+8
| * | | | Add additional details on metric source being k8s nodesJoshua Lambert2017-03-181-1/+1
| * | | | Clarify help text29618-clarify-help-text-on-prometheus-integration-pageJoshua Lambert2017-03-171-1/+1
* | | | | Merge branch 'fix/gb/pipeline-intermittent-running-status' into 'master' Kamil Trzciński2017-03-211-0/+1
|\ \ \ \ \
| * | | | | Fix pipeline status for transition between stagesGrzegorz Bizon2017-03-201-0/+1
* | | | | | Merge branch '29685-wrong-number-of-arguments-calling-http_url_to_repo-on-clo...Sean McGivern2017-03-212-8/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix ProjectWiki#http_url_to_repo signatureRémy Coutable2017-03-202-8/+7
* | | | | | Merge branch 'sh-fix-admin-application-settings' into 'master' Robert Speicher2017-03-211-0/+9
|\ \ \ \ \ \
| * | | | | | Fix Error 500 when application settings are savedStan Hu2017-03-181-0/+9
* | | | | | | Merge branch 'rs-issue-29592' into 'master' Stan Hu2017-03-211-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Handle Route#name being nil after an updateRobert Speicher2017-03-201-1/+1
* | | | | | | Merge remote-tracking branch 'dev/master'DJ Mountney2017-03-203-1/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |