summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Use lazy reference extractor to get issue's MRslazy-reference-extractorDouwe Maan2015-12-151-5/+5
| | | | | | | | | |
* | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress warning about missing `.gitlab-ci.yml` if builds are disabled When user disables GitLab Ci Service in project's settings then warning about missing `.gitlab-ci.yml` file should be supressed. This a matter of user experience as stated in #3761 (closes #3761). cc @ayufan See merge request !2014
| * \ \ \ \ \ \ \ \ Merge branch 'master' into ux/suppress-ci-yml-warningGrzegorz Bizon2015-12-1429-1031/+380
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (24 commits) Fix runners admin view Fix migrations Run builds from projects with enabled CI Use Gitlab::Git instead of Ci::Git Fix last specs Fix specs Fix after column rename Fix errors Update badge Finishing touches Fix triggers tests Rename columns and rename migrations Reimplement Trigger API Remove ci_ prefix from all ci related things Add runners token Migrate CI::Project to Project Fix indentation and BuildsEmailService Change default values Enhance migrate CI emails Fix issue tracker service ... Conflicts: spec/features/commits_spec.rb
| * | | | | | | | | | Do not display ci build status if builds enabled but no `.gitlab-ci.yml`Grzegorz Bizon2015-12-141-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref #3827
* | | | | | | | | | | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-1431-1031/+389
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (66 commits) Fix runners admin view Fix migrations Rename mention of gitlab-git-http-server to gitlab-workhorse Bump Redis requirement to 2.8 for Sidekiq 4 requirements Fix wording on runner setup page add details on how to change saml button label Fix tests Move awards back to gray panel and few improvements to sidebar Few UI improvements to new sidebar implementation Fix tests for new issuable sidebar Update changelog Implement new sidebar for merge request page Make edit link on issuable sidebar works Redesign issue page for new sidebar Move awards css to separate file Implement issuable sidebar partial Update CHANGELOG Clarify cache behavior Run builds from projects with enabled CI Use Gitlab::Git instead of Ci::Git ... Conflicts: db/schema.rb
| * | | | | | | | | | Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-1415-410/+97
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci Project migrate - This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`. - This requires offline migrations. - It simplifies database models making all CI objects to be attached to: Project. - It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers). - We should add default `timeout` to Application Settings. - It misses specs. - It is based on ci-services-migrate for now. - It removes CI events. - It removes administrator CI projects overview. - It removes CI application settings. In 8.4 or 8.5 we can remove redundant tables and columns. See merge request !1987
| | * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci Services migrate See merge request !1985
| | * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a ability to use multiple different authentication token fields in other models. From now on it is necessary to add authentication token field manually in each class that implements this mixin.
* | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2526
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/markdown/autolink_filter_spec.rb # spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb # spec/lib/gitlab/markdown/commit_reference_filter_spec.rb # spec/lib/gitlab/markdown/cross_project_reference_spec.rb # spec/lib/gitlab/markdown/emoji_filter_spec.rb # spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/external_link_filter_spec.rb # spec/lib/gitlab/markdown/issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/label_reference_filter_spec.rb # spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb # spec/lib/gitlab/markdown/redactor_filter_spec.rb # spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb # spec/lib/gitlab/markdown/relative_link_filter_spec.rb # spec/lib/gitlab/markdown/sanitization_filter_spec.rb # spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb # spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb # spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb # spec/lib/gitlab/markdown/task_list_filter_spec.rb # spec/lib/gitlab/markdown/upload_link_filter_spec.rb # spec/lib/gitlab/markdown/user_reference_filter_spec.rb
| * | | | | | | | | | Merge branch 'issue_3854' into 'master' Dmitriy Zaporozhets2015-12-091-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Downcase commit author email for matching with users Closes #3854 See merge request !1992
| | * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mr-brokenDouwe Maan2015-12-081-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/helpers/ci_status_helper.rb
| | * | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed in Admin can add/remove himself to a group/project Fixes #3640 /cc @JobV Could you have a look as well? See merge request !1942
| | * | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \