summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issuable-state-only-notes-and-description' into 'master' Sean McGivern2017-04-192-2/+2
|\
| * Display issuable state only in notes and issuable descriptionAdam Niedzielski2017-04-192-2/+2
* | Merge branch 'usage-ping-port' into 'master' Sean McGivern2017-04-191-1/+2
|\ \
| * | Fix method visibilitySean McGivern2017-04-141-2/+0
| * | Remove unused user activities codeSean McGivern2017-04-141-4/+0
| * | Port 'Add user activities API' to CESean McGivern2017-04-141-3/+1
| * | Remove user activities table and use redis instead of PG for recording activi...James Lopez2017-04-142-21/+8
| * | Add user activity service and spec. Also added relevant - NOT offline - migra...James Lopez2017-04-142-0/+21
| * | Port 'Add EE usage ping' to CESean McGivern2017-04-141-1/+2
* | | Fix active user countJames Lopez2017-04-191-1/+1
| |/ |/|
* | disables test settings on chat notification services when repository is empty31009-disable-test-settings-on-services-when-repository-is-emptyTiago Botelho2017-04-181-1/+1
* | Use DeleteUserWorker for removing users via spam logssh-use-delete-worker-spam-logsStan Hu2017-04-171-2/+2
* | Merge branch 'fix-follow-with-multiple-paths' into 'master' Douwe Maan2017-04-171-1/+1
|\ \
| * | Fix following with multiple pathsfix-follow-with-multiple-pathsSean McGivern2017-04-171-1/+1
| |/
* | Merge branch 'dz-remove-repo-version' into 'master' Douwe Maan2017-04-171-7/+1
|\ \
| * | Removes `Repository#version` method and testsdz-remove-repo-versionDmitriy Zaporozhets2017-04-171-7/+1
| |/
* | Hard delete users' associated records deleted from AbuseReportssh-add-option-to-hard-deleteStan Hu2017-04-161-1/+1
|/
* Sanitize container repository path in model classfix/gb/fix-registry-for-uppercased-project-pathsGrzegorz Bizon2017-04-131-1/+2
* Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition errorrs-fix-already-defined-constantRobert Speicher2017-04-121-2/+2
* Merge branch 'fix_spaces_in_label_title' into 'master' Sean McGivern2017-04-121-0/+6
|\
| * Remove heading and trailing spaces from label's color and titleblackst0ne2017-04-121-0/+6
* | Merge branch 'gitaly-testing' into 'master' Rémy Coutable2017-04-122-15/+16
|\ \
| * | Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testingAlejandro Rodríguez2017-04-112-15/+16
| |/
* | Merge branch '30457-expire-note-destroy' into 'master'Sean McGivern2017-04-121-0/+1
|\ \
| * | Fix issue's note cache expiration after deletemhasbini2017-04-111-0/+1
| |/
* | 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
View Lorry Controller Status