summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Banzai::XFilter -> Banzai::Filter::XFilterDouwe Maan2015-12-151-2/+2
* Move Markdown/reference logic from Gitlab::Markdown to BanzaiDouwe Maan2015-12-154-25/+26
* Merge branch 'ux/suppress-ci-yml-warning' into 'master' Grzegorz Bizon2015-12-141-0/+10
|\
| * Merge branch 'master' into ux/suppress-ci-yml-warningGrzegorz Bizon2015-12-1429-1031/+380
| |\
| * | Do not display ci build status if builds enabled but no `.gitlab-ci.yml`Grzegorz Bizon2015-12-141-0/+10
* | | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-1431-1031/+389
|\ \ \ | | |/ | |/|
| * | Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-1415-410/+97
| |\ \
| | * | Use Gitlab::Git instead of Ci::GitKamil Trzcinski2015-12-111-1/+1
| | * | Fix specsKamil Trzcinski2015-12-111-2/+4
| | * | Fix after column renameKamil Trzcinski2015-12-111-2/+2
| | * | Fix errorsKamil Trzcinski2015-12-111-1/+1
| | * | Finishing touchesKamil Trzcinski2015-12-111-3/+1
| | * | Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-114-11/+11
| | * | Add runners tokenKamil Trzcinski2015-12-112-8/+10
| | * | Migrate CI::Project to ProjectKamil Trzcinski2015-12-1115-405/+90
| * | | Merge branch 'ci-services-migrate' into 'master' Kamil Trzciński2015-12-1419-624/+286
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Fix indentation and BuildsEmailServiceci-services-migrateKamil Trzcinski2015-12-112-6/+5
| | * Change default valuesKamil Trzcinski2015-12-115-11/+29
| | * Fix issue tracker serviceKamil Trzcinski2015-12-101-11/+7
| | * Fix specsKamil Trzcinski2015-12-101-0/+1
| | * Migrate SlackService and HipChat serviceKamil Trzcinski2015-12-103-0/+6
| | * Migrate CI WebHooks and Emails to new tablesKamil Trzcinski2015-12-101-4/+7
| | * Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-1019-624/+263
| * | display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statusesGreg Smethells2015-12-111-0/+8
| * | emoji aliases problemValery Sizov2015-12-111-1/+2
* | | Make sure that token `ensure_*` method always returns a tokenGrzegorz Bizon2015-12-111-2/+6
* | | Ensure that app settings contains runners registration tokenGrzegorz Bizon2015-12-111-0/+2
* | | Use `save!` when generating new token in `TokenAuthenticatable`Grzegorz Bizon2015-12-111-1/+1
* | | Refactor `TokenAuthenticatable` to improve reusabilityGrzegorz Bizon2015-12-113-17/+30
* | | Add `runners_registration_token` to ApplicationSettingsGrzegorz Bizon2015-12-111-1/+1
|/ /
* | Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence'Douwe Maan2015-12-111-2/+18
|\ \
| * \ Merge branch 'master' into copying-file-seen-as-licenceZeger-Jan van de Weg2015-12-1062-553/+1175
| |\ \ | | |/
| * | Licence also accepted as license fileZeger-Jan van de Weg2015-12-101-7/+15
| * | Merge branch 'master' into copying-file-seen-as-licenceZeger-Jan van de Weg2015-11-1134-216/+414
| |\ \
| * | | Add specs on #licenseZeger-Jan van de Weg2015-10-151-1/+5
| * | | Prefer Licence over CopyingZeger-Jan van de Weg2015-10-141-3/+7
| * | | COPYING is now also accepted as licence fileZeger-Jan van de Weg2015-10-141-3/+3
* | | | Merge remote-tracking branch 'origin/emoji_edit_disallow'Dmitriy Zaporozhets2015-12-101-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Don't allow to edit award emoji commentsemoji_edit_disallowValery Sizov2015-12-101-1/+1
* | | | Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-cachingDouwe Maan2015-12-1011-61/+131
|\ \ \ \ | |/ / /
| * | | 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 remote-tracking branch 'origin/mr-broken'Dmitriy Zaporozhets2015-12-091-0/+4
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into mr-brokenDouwe Maan2015-12-081-1/+1
| | |\ \ \ \
| | * | | | | Add indication to merge request list item that MR cannot be merged automaticallyDouwe Maan2015-12-081-0/+4
| * | | | | | Merge branch 'fix-admin-should-be-able-to-add-himself-to-group' into 'master' Dmitriy Zaporozhets2015-12-091-8/+4
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-groupDouglas Barbosa Alexandre2015-12-0823-149/+310
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-groupDouglas Barbosa Alexandre2015-12-046-20/+15
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-groupDouglas Barbosa Alexandre2015-12-033-3/+8
| | |\ \ \ \ \ \ \
| | * | | | | | | | Signed in admin should be able to add/remove himself to a projectDouglas Barbosa Alexandre2015-12-011-4/+2
View Lorry Controller Status