summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'introduce-pipeline-triggers' into 'master' Sean McGivern2017-03-062-3/+9
|\
| * Fix trigger modelKamil Trzcinski2017-03-051-1/+0
| * Make triggers to be user awareKamil Trzcinski2017-03-051-0/+1
| * Make Pipeline Triggers to be user awareKamil Trzcinski2017-03-051-3/+9
* | Merge branch 'etag-notes-polling' into 'master' Sean McGivern2017-03-061-0/+13
|\ \ | |/ |/|
| * Invalidate ETag cache when note changesAdam Niedzielski2017-03-011-0/+13
* | Merge branch 'dz-change-project-view' into 'master' Dmitriy Zaporozhets2017-03-041-0/+1
|\ \
| * | Change default project view for user from readme to files viewdz-change-project-viewDmitriy Zaporozhets2017-03-031-0/+1
* | | Add KUBE_CA_PEM_FILE, deprecate KUBE_CA_PEMNick Thomas2017-03-031-1/+6
* | | Merge branch 'dm-fix-cherry-pick' into 'master' Robert Speicher2017-03-031-16/+17
|\ \ \ | |/ / |/| |
| * | Use separate error class for cherry-pick and revert tree errorsDouwe Maan2017-03-021-2/+3
| * | Fix cherry-picking or reverting through an MRDouwe Maan2017-03-021-16/+16
* | | Merge branch '28010-mr-merge-button-default-to-danger' into 'master' Alfredo Sumaran2017-03-031-1/+4
|\ \ \ | |/ / |/| |
| * | Default to subtle MR mege button until CI status is available28010-mr-merge-button-default-to-dangerEric Eastwood2017-03-021-1/+4
* | | Merge branch 'dm-fix-api-create-file-on-empty-repo' into 'master' Robert Speicher2017-03-021-0/+2
|\ \ \
| * | | Fix creating a file in an empty repo using the APIDouwe Maan2017-03-011-0/+2
* | | | Merge branch 'fix-build-mock-ci-service' into 'master' Douwe Maan2017-03-021-0/+1
|\ \ \ \
| * | | | Add missing association for mock_ci_servicefix-build-mock-ci-serviceAdam Niedzielski2017-03-021-0/+1
| | |/ / | |/| |
* | | | Override setters so it also accepts string visibility levels27501-api-use-visibility-everywhereToon Claes2017-03-021-0/+16
* | | | Use string based `visibility` getter & setterToon Claes2017-03-023-3/+3
* | | | Expose ApplicationSetting visibility settings as StringToon Claes2017-03-021-0/+1
* | | | Expose Project's & ProjectSnippet's VisibilityLevel as StringToon Claes2017-03-021-1/+1
|/ / /
* | | Merge branch 'fix/mwbs-to-mwps' into 'master' Douwe Maan2017-03-011-6/+6
|\ \ \
| * | | Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-011-6/+6
* | | | Merge branch 'fix/gb/remove-unused-method-from-build' into 'master' Kamil Trzciński2017-03-011-9/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove unused method from CI/CD build classfix/gb/remove-unused-method-from-buildGrzegorz Bizon2017-03-011-9/+0
| |/ /
* | | Merge branch 'custom-empty-exception-class-cop' into 'master' Robert Speicher2017-03-012-2/+2
|\ \ \ | |_|/ |/| |
| * | Enable and autocorrect the CustomErrorClass copSean McGivern2017-03-012-2/+2
| |/
* | Merge branch 'refactor/generalize-unique-internal-users' into 'master' Sean McGivern2017-03-011-14/+22
|\ \
| * | use a more namespacey key for the exclusive leaserefactor/generalize-unique-internal-usershttp://jneen.net/2017-02-281-1/+1
| * | generalize the idea of a "unique internal user"http://jneen.net/2017-02-281-14/+22
| |/
* | Merge branch '25437-just-emoji' into 'master'Sean McGivern2017-03-011-4/+0
|\ \ | |/ |/|
| * add /award slash commandmhasbini2017-02-281-4/+0
* | Merge branch 'dm-dont-share-projects-with-group-ancestors' into 'master' Dmitriy Zaporozhets2017-02-281-2/+9
|\ \
| * | Don't allow a project to be shared with an ancestor of the group it is inDouwe Maan2017-02-281-2/+9
* | | Fix access to projects shared with a nested groupdm-nested-group-shared-projectsDouwe Maan2017-02-281-1/+1
|/ /
* | Merge branch 'only-create-unmergeable-todo-once' into 'master' Kamil Trzciński2017-02-281-4/+0
|\ \
| * | Only create unmergeable todos onceonly-create-unmergeable-todo-onceSean McGivern2017-02-241-4/+0
* | | Merge branch 'mock-ci-service' into 'master'Douwe Maan2017-02-272-1/+86
|\ \ \
| * | | Add MockCiService integrationmock-ci-serviceEric Eastwood2017-02-242-1/+86
* | | | Merge branch '1937-https-clone-url-username' into 'master' Rémy Coutable2017-02-271-2/+8
|\ \ \ \
| * | | | Add the username of the current user to the HTTP(S) clone URLJan Christophersen2017-02-241-2/+8
| | |/ / | |/| |
* | | | Merge branch '27267-events-project-query-performance-regression' into 'master' Sean McGivern2017-02-271-1/+1
|\ \ \ \
| * | | | Add performance query regression fix for !9088 affecting #2726727267-events-project-query-performance-regressionOswaldo Ferreira2017-02-241-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'pedro-mattermost-slack-notifications-text' into 'master' Kamil Trzciński2017-02-262-14/+14
|\ \ \ \
| * | | | Add clearer placeholders and channel definition.Pedro Moreira da Silva2017-02-242-14/+14
| |/ / /
* | | | Merge branch '23062-allow-git-log-to-accept-follow-and-skip' into 'master' Robert Speicher2017-02-251-3/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make Git history follow renames again by performing the --skip in RubyRémy Coutable2017-02-231-3/+1
* | | | Merge branch 'dm-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-241-181/+32
|\ \ \ \
| * | | | Fix specdm-fix-web-edit-new-linesDouwe Maan2017-02-241-77/+21
View Lorry Controller Status