summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '26908-add-foreign-keys-to-timelogs' into 'master' Rubén Dávila Santos2017-02-072-2/+18
|\
| * Use normal associations instead of polymorphic.Ruben Davila2017-02-072-2/+18
* | Merge branch '25487-small-improvements-to-the-ui-of-mattermost-and-slack-comm...Clement Ho2017-02-073-5/+5
|\ \
| * | Added small improvments to the chat slash command servicesLuke "Jared" Bennett2017-02-073-5/+5
* | | Merge branch '24147-delete-env-button' into 'master' Rémy Coutable2017-02-072-6/+6
|\ \ \
| * | | Fix stoppable?Kamil Trzcinski2017-02-071-1/+1
| * | | Update changesKamil Trzcinski2017-02-061-4/+4
| * | | Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-02-0632-352/+569
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-01-24113-1685/+3006
| |\ \ \ \
| * | | | | Allow to stop any environmentKamil Trzcinski2016-11-101-4/+9
* | | | | | Merge branch 'refresh-permissions-when-moving-projects' into 'master' Rémy Coutable2017-02-072-1/+10
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Refresh authorizations when transferring projectsrefresh-permissions-when-moving-projectsYorick Peterse2017-02-072-1/+10
| | |_|_|/ | |/| | |
* | | | | Merge branch '21518_recaptcha_spam_issues' into 'master'Sean McGivern2017-02-071-3/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use reCaptcha when an issue identified as spamJarka Kadlecova2017-02-071-3/+9
| | |_|/ | |/| |
* | | | Merge branch 'ee-1439-read-only-user' into 'master' Douwe Maan2017-02-071-0/+15
|\ \ \ \
| * | | | Fix indentationee-1439-read-only-userDouwe Maan2017-02-061-4/+4
| * | | | Backport of the frontend view, including testsJose Ivan Vargas2017-02-061-0/+15
* | | | | Merge branch 'fix-deleting-project-again' into 'master' Douwe Maan2017-02-061-4/+17
|\ \ \ \ \
| * | | | | Skip or retain project while deleting the project:Lin Jen-Shin2017-02-031-4/+17
* | | | | | Don't delete assigned MRs/issues when user is deletedDouwe Maan2017-02-061-2/+3
* | | | | | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-064-7/+17
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-062-2/+16
| | |/ / / | |/| | |
| * | | | Remove backlog lists from boardsDouglas Barbosa Alexandre2017-02-032-5/+1
| |/ / /
* | | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-038-255/+321
|\ \ \ \ | |/ / /
| * | | Merge branch 'squash' into 'master' Sean McGivern2017-02-031-2/+2
| |\ \ \
| | * | | Backport changes from EE squashSean McGivern2017-02-031-2/+2
| * | | | Merge branch 'fwn-to-find-by-full-path' into 'master' Dmitriy Zaporozhets2017-02-031-5/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | replace `find_with_namespace` with `find_by_full_path`Adam Pahlevi2017-02-031-5/+1
| * | | | Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-022-221/+275
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-0211-82/+113
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-261-4/+4
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Use commit rather than branch, and rename to avoid confusionLin Jen-Shin2017-01-261-8/+8
| | * | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2681-427/+788
| | |\ \ \ \ \
| | * | | | | | Rename from base to start because base could mean merge baseLin Jen-Shin2017-01-061-39/+39
| | * | | | | | Rename source to base to avoid confusion from MRLin Jen-Shin2017-01-061-39/+39
| | * | | | | | Prefer leading dots over trailing dotsLin Jen-Shin2017-01-061-2/+2
| | * | | | | | Remove tag with git hooksLin Jen-Shin2017-01-051-8/+11
| | * | | | | | Introduce Repository#with_repo_branch_commitLin Jen-Shin2017-01-051-9/+16
| | * | | | | | Indent the way rubocop likesLin Jen-Shin2017-01-051-1/+1
| | * | | | | | Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-0462-439/+1168
| | |\ \ \ \ \ \
| | * | | | | | | Also check blob path from source branchLin Jen-Shin2016-12-141-18/+39
| | * | | | | | | Not sure why, but apparently SHA works betterLin Jen-Shin2016-12-121-2/+2
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-1012-141/+226
| | |\ \ \ \ \ \ \
| | * | | | | | | | Pass source_commit so that we save a few lookupsLin Jen-Shin2016-12-101-33/+18
| | * | | | | | | | Use rugged.references.delete to delete referenceLin Jen-Shin2016-12-091-3/+3
| | * | | | | | | | Introduce git_action and normalize previous_pathLin Jen-Shin2016-12-091-26/+46
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-0819-97/+119
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Introduce Repository#with_tmp_ref which we needLin Jen-Shin2016-12-082-1/+17
| | * | | | | | | | | Cleanup parameters, easier to understand andLin Jen-Shin2016-12-081-43/+48
| | * | | | | | | | | find the commit properly and replicate gitlab_gitLin Jen-Shin2016-12-081-1/+5