summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-cachingDouwe Maan2015-12-10351-873/+2656
|\
| * Merge branch 'rs-reset-db' into 'master' Kamil Trzciński2015-12-101-1/+1
| |\
| | * Run db:reset before db:create on CIrs-reset-dbRobert Speicher2015-12-091-1/+1
| * | Merge branch 'devise_paranoid_mode' into 'master' Robert Speicher2015-12-105-17/+21
| |\ \
| | * | Use devise paranoid mode and ensure the same message is returned every timeDrew Blessing2015-12-095-17/+21
| * | | Merge branch 'ui-fix' into 'master' Dmitriy Zaporozhets2015-12-101-19/+25
| |\ \ \
| | * | | Fix list with controls displayDmitriy Zaporozhets2015-12-101-19/+25
| * | | | Merge pull request #9897 from atomaka/atomaka/bugfix/consistent-no-ssh-messageDmitriy Zaporozhets2015-12-101-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | "No ssh" message should be same on project pageAndrew Tomaka2015-12-091-1/+1
| * | | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2015-12-091-1/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'yaml_safe_load' into 'master' Robert Speicher2015-12-091-1/+1
| | |\ \ \ \ | |/ / / / /
| | * | | | Allow [Symbol] when loading YAML Kamil Trzciński2015-12-091-2/+2
| | * | | | Use YAML.safe_loadKamil Trzciński2015-12-091-2/+2
| | | |/ / | | |/| |
| * | | | Merge branch 'issue_3854' into 'master' Dmitriy Zaporozhets2015-12-091-2/+2
| |\ \ \ \
| | * | | | Normalize email when looking for GitLab users from commit info. #3854issue_3854Rubén Dávila2015-12-091-2/+2
| * | | | | Merge branch 'move-network'Dmitriy Zaporozhets2015-12-098-20/+29
| |\ \ \ \ \
| | * | | | | Fix test for network shortcutmove-networkDmitriy Zaporozhets2015-12-093-5/+6
| | * | | | | remove unnecessary codeDmitriy Zaporozhets2015-12-091-4/+3
| | * | | | | Move Network page from separate tab to sub tab of CommitsDmitriy Zaporozhets2015-12-098-19/+28
| * | | | | | Merge branch 'rs-delimit-build-counts' into 'master' Dmitriy Zaporozhets2015-12-091-3/+6
| |\ \ \ \ \ \
| | * | | | | | Add number_with_delimiter to build countsrs-delimit-build-countsRobert Speicher2015-12-091-3/+6
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'fix-migrations' into 'master' Dmitriy Zaporozhets2015-12-093-40/+51
| |\ \ \ \ \ \
| | * | | | | | Use up and downDouwe Maan2015-12-091-1/+5
| | * | | | | | Fix migrations for postgres on test environmentDmitriy Zaporozhets2015-12-073-39/+46
| * | | | | | | Merge remote-tracking branch 'origin/mr-broken'Dmitriy Zaporozhets2015-12-098-32/+66
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Fix specsmr-brokenDouwe Maan2015-12-081-2/+2
| | * | | | | | Fix specsDouwe Maan2015-12-081-1/+1
| | * | | | | | Merge branch 'master' into mr-brokenDouwe Maan2015-12-0878-259/+953
| | |\ \ \ \ \ \
| | * | | | | | | Use "Build passed" in tooltip instead of "Build status: passed"Douwe Maan2015-12-083-3/+3
| | * | | | | | | Add indication to merge request list item that MR cannot be merged automaticallyDouwe Maan2015-12-084-27/+61
| * | | | | | | | Update CHANGELOGRobert Speicher2015-12-091-5/+3
| * | | | | | | | Merge branch 'fix-typos' into 'master' Robert Speicher2015-12-097-7/+7
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Fix typos in integration docsTobias Stöckler2015-12-077-7/+7
| * | | | | | | | Merge branch 'master' into 'master' Robert Speicher2015-12-091-2/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update init script only onceFelix Eckhofer2015-12-091-2/+1
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'rs-default-clone-fixes' into 'master' Robert Speicher2015-12-092-2/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Simplify shared User SSH key stepsRobert Speicher2015-12-091-2/+2
| | * | | | | | | | Add CHANGELOG entry for !1998Robert Speicher2015-12-091-0/+1
| * | | | | | | | | Merge branch 'split-up-builds' into 'master' Dmitriy Zaporozhets2015-12-09211-202/+289
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Make sure everyone has shared/lfs-objectssplit-up-buildsDouwe Maan2015-12-091-0/+0
| | * | | | | | | | | Merge branch 'master' into split-up-buildsDouwe Maan2015-12-0950-273/+1626
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Split up spec:other even moreDouwe Maan2015-12-092-1/+33
| | * | | | | | | | | Tag service specsDouwe Maan2015-12-0941-41/+41
| | * | | | | | | | | Tag lib specsDouwe Maan2015-12-0985-86/+86
| | * | | | | | | | | Fix rspec tag syntaxDouwe Maan2015-12-091-1/+1
| | * | | | | | | | | Split up specs moreDouwe Maan2015-12-092-2/+18
| | * | | | | | | | | Tag model specsDouwe Maan2015-12-0968-68/+68
| | * | | | | | | | | Split up feature specs moreDouwe Maan2015-12-092-5/+32
| | * | | | | | | | | Tag feature specsDouwe Maan2015-12-0913-1/+13
| * | | | | | | | | | Merge branch 'remove-default-branch-option-from-doc' into 'master' Dmitriy Zaporozhets2015-12-091-1/+0
| |\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status