summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'route-map' into 'master' Robert Speicher2017-02-074-101/+166
|\
| * Address feedbackDouwe Maan2017-02-063-113/+14
| * Update outdated specDouwe Maan2017-02-061-2/+0
| * Tweak test to verify there are no duplicatesDouwe Maan2017-02-061-2/+2
| * Improve performance of finding last deployed environmentDouwe Maan2017-02-063-79/+14
| * Add testsDouwe Maan2017-02-064-0/+231
* | Merge branch '26908-add-foreign-keys-to-timelogs' into 'master' Rubén Dávila Santos2017-02-071-0/+28
|\ \
| * | Use normal associations instead of polymorphic.Ruben Davila2017-02-071-0/+28
* | | Merge branch '24147-delete-env-button' into 'master' Rémy Coutable2017-02-072-8/+30
|\ \ \
| * | | Fix stoppable?Kamil Trzcinski2017-02-072-4/+4
| * | | Update changesKamil Trzcinski2017-02-061-4/+4
| * | | Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-02-0670-377/+836
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-01-2481-2608/+5999
| |\ \ \ \
| * | | | | Allow to stop any environmentKamil Trzcinski2016-11-101-6/+28
* | | | | | Refresh authorizations when transferring projectsrefresh-permissions-when-moving-projectsYorick Peterse2017-02-072-0/+20
| |_|_|/ / |/| | | |
* | | | | Merge branch 'ee-1439-read-only-user' into 'master' Douwe Maan2017-02-071-0/+33
|\ \ \ \ \
| * | | | | More backportDouwe Maan2017-02-061-0/+33
* | | | | | Update specDouwe Maan2017-02-061-2/+2
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'jej-pages-to-ce' into 'master' Douwe Maan2017-02-062-0/+212
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-064-53/+34
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-039-138/+243
| |\ \ \ \ \
| * | | | | | Update validates_hostname to 1.0.6 to fix a bug in parsing hexadecimal-lookin...Nick Thomas2017-02-011-1/+7
| * | | | | | Fix Rubocop offensesGrzegorz Bizon2017-02-011-7/+7
| * | | | | | Mock Dir::exist? in project_spec.rbKamil Trzcinski2017-01-311-2/+1
| * | | | | | Introduce pages_deployed? to Project modelKamil Trzcinski2017-01-311-6/+17
| * | | | | | Describe #pages_url instead of :pages_urlKamil Trzcinski2017-01-311-1/+1
| * | | | | | Fix the URL of group pagesKamil Trzcinski2017-01-311-0/+33
| * | | | | | Update commentsKamil Trzcinski2017-01-311-0/+4
| * | | | | | Verify trusted certificate chainKamil Trzcinski2017-01-311-4/+10
| * | | | | | Pages domain model specsKamil Trzcinski2017-01-312-0/+153
* | | | | | | Merge branch 'traits-for-featurs' into 'master'Robert Speicher2017-02-065-7/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add traits for ProjectFeatures to Project factorySemyon Pupkov2017-02-055-7/+3
| | |_|/ / / | |/| | | |
* | | | | | Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-061-2/+14
|/ / / / /
* | | | | Merge branch 'rs-event-traits' into 'master' Rémy Coutable2017-02-032-16/+16
|\ \ \ \ \
| * | | | | Add traits for the different Event types to the Event factoryrs-event-traitsRobert Speicher2017-02-012-16/+16
* | | | | | Merge branch 'add-issues-to-boards' into 'master' Fatih Acet2017-02-031-35/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Remove backlog lists from boardsDouglas Barbosa Alexandre2017-02-031-35/+4
* | | | | | Merge branch '17662-rename-builds' into 'master' Kamil Trzciński2017-02-031-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix broken tests17662-rename-buildsFilipa Lacerda2017-02-031-2/+2
* | | | | | Backport changes from EE squashSean McGivern2017-02-031-3/+11
|/ / / / /
* | | | | Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-023-58/+138
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-0265-158/+279
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-262-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2642-1800/+2756
| |\ \ \ \ \ \
| * | | | | | | Fix renamingLin Jen-Shin2017-01-071-1/+1
| * | | | | | | Remove tag with git hooksLin Jen-Shin2017-01-051-2/+3
| * | | | | | | Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-0443-673/+1607
| |\ \ \ \ \ \ \
| * | | | | | | | Unify parameters and callback after hooksLin Jen-Shin2016-12-141-4/+3
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-1010-129/+298
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Pass source_commit so that we save a few lookupsLin Jen-Shin2016-12-101-5/+23