Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't allow to edit award emoji commentsemoji_edit_disallow | Valery Sizov | 2015-12-10 | 3 | -1/+19 |
* | Merge branch 'rs-reset-db' into 'master' | Kamil Trzciński | 2015-12-10 | 1 | -1/+1 |
|\ | |||||
| * | Run db:reset before db:create on CIrs-reset-db | Robert Speicher | 2015-12-09 | 1 | -1/+1 |
* | | Merge branch 'devise_paranoid_mode' into 'master' | Robert Speicher | 2015-12-10 | 5 | -17/+21 |
|\ \ | |||||
| * | | Use devise paranoid mode and ensure the same message is returned every time | Drew Blessing | 2015-12-09 | 5 | -17/+21 |
* | | | Merge branch 'ui-fix' into 'master' | Dmitriy Zaporozhets | 2015-12-10 | 1 | -19/+25 |
|\ \ \ | |||||
| * | | | Fix list with controls display | Dmitriy Zaporozhets | 2015-12-10 | 1 | -19/+25 |
* | | | | Merge pull request #9897 from atomaka/atomaka/bugfix/consistent-no-ssh-message | Dmitriy Zaporozhets | 2015-12-10 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | "No ssh" message should be same on project page | Andrew Tomaka | 2015-12-09 | 1 | -1/+1 |
* | | | | Merge remote-tracking branch 'dev/master' into 'master' | Robert Speicher | 2015-12-09 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'yaml_safe_load' into 'master' | Robert Speicher | 2015-12-09 | 1 | -1/+1 |
| |\ \ \ \ |/ / / / / | |||||
| * | | | | Allow [Symbol] when loading YAML | Kamil Trzciński | 2015-12-09 | 1 | -2/+2 |
| * | | | | Use YAML.safe_load | Kamil Trzciński | 2015-12-09 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'issue_3854' into 'master' | Dmitriy Zaporozhets | 2015-12-09 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Normalize email when looking for GitLab users from commit info. #3854issue_3854 | Rubén Dávila | 2015-12-09 | 1 | -2/+2 |
* | | | | | Merge branch 'move-network' | Dmitriy Zaporozhets | 2015-12-09 | 8 | -20/+29 |
|\ \ \ \ \ | |||||
| * | | | | | Fix test for network shortcutmove-network | Dmitriy Zaporozhets | 2015-12-09 | 3 | -5/+6 |
| * | | | | | remove unnecessary code | Dmitriy Zaporozhets | 2015-12-09 | 1 | -4/+3 |
| * | | | | | Move Network page from separate tab to sub tab of Commits | Dmitriy Zaporozhets | 2015-12-09 | 8 | -19/+28 |
* | | | | | | Merge branch 'rs-delimit-build-counts' into 'master' | Dmitriy Zaporozhets | 2015-12-09 | 1 | -3/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add number_with_delimiter to build countsrs-delimit-build-counts | Robert Speicher | 2015-12-09 | 1 | -3/+6 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'fix-migrations' into 'master' | Dmitriy Zaporozhets | 2015-12-09 | 3 | -40/+51 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use up and down | Douwe Maan | 2015-12-09 | 1 | -1/+5 |
| * | | | | | | Fix migrations for postgres on test environment | Dmitriy Zaporozhets | 2015-12-07 | 3 | -39/+46 |
* | | | | | | | Merge remote-tracking branch 'origin/mr-broken' | Dmitriy Zaporozhets | 2015-12-09 | 8 | -32/+66 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Fix specsmr-broken | Douwe Maan | 2015-12-08 | 1 | -2/+2 |
| * | | | | | | Fix specs | Douwe Maan | 2015-12-08 | 1 | -1/+1 |
| * | | | | | | Merge branch 'master' into mr-broken | Douwe Maan | 2015-12-08 | 78 | -259/+953 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Use "Build passed" in tooltip instead of "Build status: passed" | Douwe Maan | 2015-12-08 | 3 | -3/+3 |
| * | | | | | | | Add indication to merge request list item that MR cannot be merged automatically | Douwe Maan | 2015-12-08 | 4 | -27/+61 |
* | | | | | | | | Update CHANGELOG | Robert Speicher | 2015-12-09 | 1 | -5/+3 |
* | | | | | | | | Merge branch 'fix-typos' into 'master' | Robert Speicher | 2015-12-09 | 7 | -7/+7 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Fix typos in integration docs | Tobias Stöckler | 2015-12-07 | 7 | -7/+7 |
* | | | | | | | | Merge branch 'master' into 'master' | Robert Speicher | 2015-12-09 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update init script only once | Felix Eckhofer | 2015-12-09 | 1 | -2/+1 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'rs-default-clone-fixes' into 'master' | Robert Speicher | 2015-12-09 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Simplify shared User SSH key steps | Robert Speicher | 2015-12-09 | 1 | -2/+2 |
| * | | | | | | | | Add CHANGELOG entry for !1998 | Robert Speicher | 2015-12-09 | 1 | -0/+1 |
* | | | | | | | | | Merge branch 'split-up-builds' into 'master' | Dmitriy Zaporozhets | 2015-12-09 | 211 | -202/+289 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Make sure everyone has shared/lfs-objectssplit-up-builds | Douwe Maan | 2015-12-09 | 1 | -0/+0 |
| * | | | | | | | | | Merge branch 'master' into split-up-builds | Douwe Maan | 2015-12-09 | 50 | -273/+1626 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Split up spec:other even more | Douwe Maan | 2015-12-09 | 2 | -1/+33 |
| * | | | | | | | | | Tag service specs | Douwe Maan | 2015-12-09 | 41 | -41/+41 |
| * | | | | | | | | | Tag lib specs | Douwe Maan | 2015-12-09 | 85 | -86/+86 |
| * | | | | | | | | | Fix rspec tag syntax | Douwe Maan | 2015-12-09 | 1 | -1/+1 |
| * | | | | | | | | | Split up specs more | Douwe Maan | 2015-12-09 | 2 | -2/+18 |
| * | | | | | | | | | Tag model specs | Douwe Maan | 2015-12-09 | 68 | -68/+68 |
| * | | | | | | | | | Split up feature specs more | Douwe Maan | 2015-12-09 | 2 | -5/+32 |
| * | | | | | | | | | Tag feature specs | Douwe Maan | 2015-12-09 | 13 | -1/+13 |
* | | | | | | | | | | Merge branch 'remove-default-branch-option-from-doc' into 'master' | Dmitriy Zaporozhets | 2015-12-09 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ |