Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge branch 'remove-redcloth' into 'master' "revert-2037 | Douwe Maan | 2015-12-11 | 4 | -2/+6 |
* | Merge branch 'feature/project_js_from_ee' into 'master' | Douwe Maan | 2015-12-11 | 1 | -2/+5 |
|\ | |||||
| * | Aling project js with EE | Borja Aparicio | 2015-12-10 | 1 | -2/+5 |
* | | Merge branch 'complexity/rubocop-metrics' into 'master' | Douwe Maan | 2015-12-11 | 10 | -156/+368 |
|\ \ | |||||
| * | | Mix url helpers in into `RepositoryPush` | Grzegorz Bizon | 2015-12-11 | 1 | -9/+10 |
| * | | Bump cyclomatic and perceived complexity threshold by one | Grzegorz Bizon | 2015-12-08 | 1 | -2/+2 |
| * | | Refactor CI YAML processor's validators | Grzegorz Bizon | 2015-12-08 | 2 | -29/+43 |
| * | | Check if commits are available in `RepositoryPush` | Grzegorz Bizon | 2015-12-08 | 1 | -3/+3 |
| * | | Duplicate options in `RepositoryPush` | Grzegorz Bizon | 2015-12-08 | 1 | -4/+4 |
| * | | Move `common_mentionable_setup` to shared context in specs | Grzegorz Bizon | 2015-12-08 | 1 | -3/+3 |
| * | | Add `RepositoryPush` specs | Grzegorz Bizon | 2015-12-08 | 2 | -5/+127 |
| * | | Fix specs by adding forgotten instance variable | Grzegorz Bizon | 2015-12-08 | 1 | -0/+3 |
| * | | Fix url helpers in RepositoryPush | Grzegorz Bizon | 2015-12-08 | 1 | -3/+4 |
| * | | Remove obsolete variables in `repository_push_email` | Grzegorz Bizon | 2015-12-08 | 4 | -48/+46 |
| * | | Improve Messagee::RepositoryPush | Grzegorz Bizon | 2015-12-08 | 2 | -64/+68 |
| * | | Refactor RepositoryPush, move to Message namespace | Grzegorz Bizon | 2015-12-08 | 3 | -134/+140 |
| * | | Make `can_send_from_user_email?` public in Notify | Grzegorz Bizon | 2015-12-08 | 1 | -2/+2 |
| * | | Extract repository_push_email to separate class | Grzegorz Bizon | 2015-12-08 | 2 | -77/+135 |
| * | | Enable rubocop metrics | Grzegorz Bizon | 2015-12-08 | 1 | -19/+24 |
* | | | Merge branch 'fix/award-emoji-alert-width' into 'master' | Grzegorz Bizon | 2015-12-11 | 4 | -13/+4 |
|\ \ \ | |||||
| * | | | Update changelog | Grzegorz Bizon | 2015-12-11 | 1 | -0/+1 |
| * | | | Fix award-emojis alert flash message | Grzegorz Bizon | 2015-12-11 | 3 | -13/+3 |
|/ / / | |||||
* | | | Merge branch 'emoji_aliases' into 'master' | Valery Sizov | 2015-12-11 | 6 | -3/+55 |
|\ \ \ | |||||
| * | | | emoji aliases problem | Valery Sizov | 2015-12-11 | 6 | -3/+55 |
|/ / / | |||||
* | | | Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence' | Douwe Maan | 2015-12-11 | 3 | -3/+39 |
|\ \ \ | |||||
| * | | | Target right release | Zeger-Jan van de Weg | 2015-12-10 | 1 | -1/+1 |
| * | | | Merge branch 'master' into copying-file-seen-as-licence | Zeger-Jan van de Weg | 2015-12-10 | 1055 | -9051/+18539 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Licence also accepted as license file | Zeger-Jan van de Weg | 2015-12-10 | 3 | -9/+26 |
| * | | | Set changelog item to right release | Zeger-Jan van de Weg | 2015-11-11 | 1 | -1/+1 |
| * | | | Merge branch 'master' into copying-file-seen-as-licence | Zeger-Jan van de Weg | 2015-11-11 | 653 | -4489/+10685 |
| |\ \ \ | |||||
| * | | | | Add specs on #license | Zeger-Jan van de Weg | 2015-10-15 | 3 | -2/+17 |
| * | | | | Add changelog line to right release | Zeger-Jan van de Weg | 2015-10-14 | 1 | -2/+1 |
| * | | | | Prefer Licence over Copying | Zeger-Jan van de Weg | 2015-10-14 | 1 | -3/+7 |
| * | | | | COPYING is now also accepted as licence file | Zeger-Jan van de Weg | 2015-10-14 | 2 | -3/+5 |
* | | | | | Merge branch 'rs-update-gitlab_emoji' into 'master' | Valery Sizov | 2015-12-11 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Bump gitlab_emoji to ~> 0.2.0rs-update-gitlab_emoji | Robert Speicher | 2015-12-05 | 2 | -2/+2 |
* | | | | | | Update CHANGELOG for 7bb8bb85 | Stan Hu | 2015-12-10 | 1 | -0/+1 |
* | | | | | | Merge branch 'auth_hash_fix' into 'master' | Stan Hu | 2015-12-11 | 2 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | AuthHash should not parameterize email user | Corey Hinshaw | 2015-12-10 | 2 | -3/+3 |
* | | | | | | | Merge branch 'remove_check_icon_from_mr_page' into 'master' | Dmitriy Zaporozhets | 2015-12-11 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove check icon from merged requestsremove_check_icon_from_mr_page | Achilleas Pipinellis | 2015-12-10 | 1 | -1/+0 |
* | | | | | | | | Merge branch 'bump-devise-3.5.3' into 'master' | Dmitriy Zaporozhets | 2015-12-11 | 3 | -3/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Bump devise to 3.5.3 to fix reset token expiring after account creation | Stan Hu | 2015-12-10 | 3 | -3/+4 |
* | | | | | | | | | Merge pull request #9850 from davydovanton/doc-fix-typos | Stan Hu | 2015-12-10 | 5 | -7/+7 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix typos in all docs [skip ci] | Anton Davydov | 2015-11-24 | 5 | -7/+7 |
* | | | | | | | | | Merge branch 'user_file_uploads_documentation' into 'master' | Achilleas Pipinellis | 2015-12-10 | 2 | -1/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Document file upload random uuid security | Drew Blessing | 2015-12-10 | 2 | -1/+13 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'feature/sidekiq-4' into 'master' | Dmitriy Zaporozhets | 2015-12-10 | 4 | -9/+21 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Upgraded Sidekiq to 4.xfeature/sidekiq-4 | Gabriel Mazetto | 2015-12-10 | 4 | -9/+21 |
* | | | | | | | | | Merge branch 'report-errors-on-service-creation' of https://gitlab.com/stanhu... | Dmitriy Zaporozhets | 2015-12-10 | 3 | -2/+13 |
|\ \ \ \ \ \ \ \ \ |