summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-outdated-diff-link' into 'master' Sean McGivern2017-04-1110-21/+57
|\
| * Statisfy Robertcop and Seancopdm-outdated-diff-linkDouwe Maan2017-04-111-9/+3
| * Add specsDouwe Maan2017-04-101-0/+12
| * Some code tweaksDouwe Maan2017-04-083-8/+12
| * Fix find_by_diff_refsDouwe Maan2017-04-081-1/+1
| * Fix specs and make tweaksDouwe Maan2017-04-082-2/+5
| * Cache MR diffs by diff refsDouwe Maan2017-04-081-1/+5
| * Link to outdated diff in older MR version from outdated diff discussionDouwe Maan2017-04-088-13/+32
* | Merge branch 'rs-remove-open-for-scope' into 'master' test-branch-nameDouwe Maan2017-04-113-7/+0
|\ \
| * | Remove an unused `cared` scope from Issue and MergeRequestrs-remove-open-for-scopeRobert Speicher2017-04-103-6/+0
| * | Remove an unused `Issue.open_for` scopeRobert Speicher2017-04-101-1/+0
* | | Merge branch 'zj-fk-ci-triggers' into 'master' Yorick Peterse2017-04-111-1/+1
|\ \ \
| * | | Add foreign key on trigger requestszj-fk-ci-triggersZ.J. van de Weg2017-04-111-1/+1
| |/ /
* | | Merge branch 'fix/gb/improve-container-registry-clipboard-links' into 'master' Kamil Trzciński2017-04-111-0/+4
|\ \ \
| * | | Add method that returns a registry repository locationGrzegorz Bizon2017-04-101-0/+4
| | |/ | |/|
* | | Merge branch 'fix_cache_expiration_in_repository' into 'master' Robert Speicher2017-04-101-2/+0
|\ \ \
| * | | Fix redundant cache expiration in Repositoryblackst0ne2017-04-101-2/+0
| |/ /
* | | Don't show 'Copy content' button on text files that are not rendered as textDouwe Maan2017-04-101-5/+25
| |/ |/|
* | Remove the User#is_admin? methodblackst0ne2017-04-091-4/+0
|/
* Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-0716-185/+231
|\
| * Merge branch 'dosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea...Sean McGivern2017-04-072-5/+22
| |\
| | * Fix test failuresKamil Trzcinski2017-04-071-2/+3
| | * Update code to remove no longer needed changesKamil Trzcinski2017-04-071-1/+1
| | * Fix ref referenceKamil Trzcinski2017-04-072-11/+10
| | * N/A to None. Revert validates from validates_presence_of.Shinya Maeda2017-04-071-1/+1
| | * Add def trigger_schedule in Trigger. Use persisted? for checling existanceShinya Maeda2017-04-071-0/+4
| | * before_create :set_project. Now TriggerSchedule saves project from parentShinya Maeda2017-04-071-1/+5
| | * Use allow_destroy. Remove condtion from form.haml.Shinya Maeda2017-04-072-15/+5
| | * Add form for scheduled triggerShinya Maeda2017-04-072-1/+20
| * | Merge branch 'optimise-builds' into 'master' Sean McGivern2017-04-071-1/+1
| |\ \
| | * | Count number of queriesKamil Trzcinski2017-04-071-1/+1
| | |/
| * | Merge branch 'bvl-fix-project-ci-status-cache' into 'master' Kamil Trzciński2017-04-073-93/+1
| |\ \
| | * | Use `Ci::ExpirePipelineCacheService` to set `ProjectPipelinestatus`bvl-fix-project-ci-status-cacheBob Van Landuyt2017-04-071-5/+0
| | * | Rename `ProjectBuildStatus` -> `ProjectPipelineStatus`Bob Van Landuyt2017-04-072-2/+2
| | * | Wrap updating of cache after pipeline transition in class methodBob Van Landuyt2017-04-071-1/+1
| | * | Update project build status cache when transitioningBob Van Landuyt2017-04-071-3/+2
| | * | Rename Ci::PipelineStatus -> Ci::ProjectBuildStatusBob Van Landuyt2017-04-073-88/+2
| | |/
| * | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-0711-86/+207
| |\ \ | | |/ | |/|
| | * Protected tags changes from backend maintainer reviewJames Edwards-Jones2017-04-072-2/+4
| | * Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0622-272/+481
| | |\
| | * \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-062-1/+12
| | |\ \
| | * | | Protected Tags backend review changesJames Edwards-Jones2017-04-065-3/+13
| | * | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0637-152/+348
| | |\ \ \
| | * | | | Fixed UserAccess#can_create_tag? after create_access_levels renameJames Edwards-Jones2017-04-041-2/+2
| | * | | | Renamed ProtectedTag push_access_levels to create_access_levelsJames Edwards-Jones2017-04-042-4/+4
| | * | | | Cleaned up duplication with ProtectedRefAccess concernJames Edwards-Jones2017-04-043-44/+18
| | * | | | Cleanup & tests for UserAccess#can_create_tag?James Edwards-Jones2017-04-041-1/+1
| | * | | | Fixed developers_can_push in RepoBranch API entityJames Edwards-Jones2017-04-041-0/+6
| | * | | | Fix typos in ProtectedRef concern and whitespace detected by rubocopJames Edwards-Jones2017-04-031-2/+2
| | * | | | Clean up non TODO rubocop errorsJames Edwards-Jones2017-04-032-2/+1
View Lorry Controller Status