summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Make the structure of spec/models match app/modelsRobert Speicher2015-01-3015-0/+0
| |/
| * Update shoulda-matchersRobert Speicher2015-01-291-1/+1
| | | | | | | | | | | | | | This outdated gem was the cause of those annoying MiniTest errors. Also updates one use of `ensure_inclusion_of` which was deprecated in favor of `validate_inclusion_of`.
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Marco Wessel2015-01-303-5/+123
|\ \ | |/ | | | | | | | | | | | | configure-protection Conflicts: CHANGELOG db/schema.rb
| * Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master'Dmitriy Zaporozhets2015-01-272-5/+88
| |\ | | | | | | | | | | | | | | | Move external issue tracker away from yml config See merge request !1442
| | * Merge branch 'master' into move_external_issue_tracker_away_from_yml_configMarin Jankovski2015-01-261-27/+42
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/project.rb spec/models/project_spec.rb
| | * | Make issue tracker service fields required.Marin Jankovski2015-01-261-0/+83
| | | |
| | * | Merge branch 'master' into move_external_issue_tracker_away_from_yml_configMarin Jankovski2015-01-236-12/+26
| | |\ \
| | * | | Do a check which issue tracker is used inside the project.Marin Jankovski2015-01-231-3/+3
| | | | |
| * | | | Added support for firing system hooks on group create/destroy and ↵Boyan Tabakov2015-01-271-0/+35
| | |_|/ | |/| | | | | | | | | | | | | | | | | | adding/removing users to group. Added tests and updated docs. Also adding 'user_id' field in the hooks for adding/removing user from team.
* | | | Spelling errorMarco Wessel2015-01-251-1/+1
| | | |
* | | | Allow configuring protection of the default branch upon first pushMarco Wessel2015-01-251-9/+10
|/ / /
* | | Fix tests, merge conflicts, some minor issues and make the project avatar ↵Hannes Rosenögger2015-01-241-29/+29
| | | | | | | | | | | | feature mergable
* | | adding avatar to project settings page added avatar removal show project ↵Steven Thonus2015-01-241-0/+15
| |/ |/| | | | | avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix
* | Annotate modelsDmitriy Zaporozhets2015-01-225-8/+26
| |
* | Allow commit messages to close several issues at once (thanks @123Haynesjubianchi2015-01-201-4/+0
|/ | | | for his work and help)
* Fixed testsStefan Tatschner2015-01-151-1/+1
|
* Fix test hook and testsDmitriy Zaporozhets2015-01-125-5/+5
|
* Fix feature and testsDmitriy Zaporozhets2015-01-081-3/+1
|
* Improve application settings and write testsDmitriy Zaporozhets2015-01-081-0/+7
|
* Supporting for multiple omniauth provider for the same userValery Sizov2014-12-041-5/+11
|
* Refactor merge request refresh logic on pushDmitriy Zaporozhets2014-11-111-57/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' into mentioned_inside_mrDmitriy Zaporozhets2014-11-062-4/+3
|\
| * Merge branch 'gitlab-ci-parallel' into 'master'Dmitriy Zaporozhets2014-11-051-2/+2
| |\ | | | | | | | | | | | | | | | Update GitLab CI service to work with new GitLab CI See merge request !1239
| | * Modify tests to match new gitlab_ci_service logicDmitriy Zaporozhets2014-11-051-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge pull request #8233 from cirosantilli/rm-new-branch-deadValeriy Sizov2014-11-051-1/+0
| |\ \ | | | | | | | | Remove dead Event#new_branch? method
| | * | Remove dead Event#new_branch? methodCiro Santilli2014-11-031-1/+0
| | | |
| * | | Merge pull request #8234 from cirosantilli/factor-0000Valeriy Sizov2014-11-051-1/+1
| |\ \ \ | | | | | | | | | | Factor '0' * 40 blank ref constants [failure unrelated]
| | * | | Factor '0' * 40 blank ref constantsCiro Santilli2014-11-031-1/+1
| | |/ /
* | | | Create a failing test where commit in mr creates a mr mention note.Marin Jankovski2014-11-051-0/+6
|/ / /
* | | Merge pull request #8222 from cirosantilli/concat-with-backslashRobert Schilling2014-11-041-3/+3
|\ \ \ | | | | | | | | Continue strings with backslash instead of append
| * | | Continue strings with backslash instead of appendCiro Santilli2014-11-011-3/+3
| | | |
* | | | Merge branch 'master' into jastkand/gitlab-ce-fix-api-authDmitriy Zaporozhets2014-11-032-51/+7
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * | | Merge pull request #8156 from stevenosloan/update_slack_and_use_raw_webhook_urlMarin Jankovski2014-11-031-50/+6
| |\ \ \ | | |_|/ | |/| | update slack-notifier for new webhook_url format
| | * | update slack-notifier to 1.0.0, use raw webhook_url per slack recommendationSteven Sloan2014-10-231-50/+6
| | | | | | | | | | | | | | | | | | | | per changes with slack, they’re now using “static” web hook urls that describe the team & service with IDs that don’t change if the team or service name change. their recommendation is to use the raw webhook_url instead of building it out of components to allow more flexibility this should also prevent issues cropping up with mistakes in how the urls are parsed
| * | | Use require spec_helper instead of relative pathCiro Santilli2014-11-011-1/+1
| | |/ | |/| | | | | | | | | | More portable if either test or class gets moved, more uniform with the rest of the tests.
* | | Session API: Use case-insensitive authentication like in UIAndrey Krivko2014-10-301-0/+14
|/ /
* | Mentioned users are not limited by project scope any moreDmitriy Zaporozhets2014-10-301-0/+14
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add test for allowed team name of slack.Marin Jankovski2014-10-211-0/+20
|
* Merge tests to support Multiple LDAP groupsJan-Willem van der Meer2014-10-131-0/+19
|
* Merge branch 'sorting-users-in-admin' into 'master'Dmitriy Zaporozhets2014-10-131-0/+28
|\ | | | | | | | | | | Sorting users in admin See merge request !1170
| * Admin: user sortingValery Sizov2014-10-131-0/+28
| |
* | Fix testsDmitriy Zaporozhets2014-10-101-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Use 8chars short sha for commit in viewsDmitriy Zaporozhets2014-10-101-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Use short_id instead of [0..N] for short version of commit shaDmitriy Zaporozhets2014-10-102-3/+3
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* annotateValery Sizov2014-10-0911-90/+89
|
* Snippets: public/internal/privateValery Sizov2014-10-091-0/+4
|
* Merge branch 'master' into buildbox-serviceKeith Pitt2014-10-087-12/+138
|\ | | | | | | | | Conflicts: app/models/project.rb
| * Merge branch 'slack_integration' into 'master'Dmitriy Zaporozhets2014-10-061-9/+25
| |\ | | | | | | | | | | | | | | | Slack integration See merge request !1151
| | * Accommodate new webhook url format.Marin Jankovski2014-10-061-0/+21
| | |
| | * Fix slack service speck.Marin Jankovski2014-10-061-9/+4
| | |