Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Make the structure of spec/models match app/models | Robert Speicher | 2015-01-30 | 15 | -0/+0 | |
| |/ | ||||||
| * | Update shoulda-matchers | Robert Speicher | 2015-01-29 | 1 | -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 Wessel | 2015-01-30 | 3 | -5/+123 | |
|\ \ | |/ | | | | | | | | | | | | | configure-protection Conflicts: CHANGELOG db/schema.rb | |||||
| * | Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master' | Dmitriy Zaporozhets | 2015-01-27 | 2 | -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_config | Marin Jankovski | 2015-01-26 | 1 | -27/+42 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/project.rb spec/models/project_spec.rb | |||||
| | * | | Make issue tracker service fields required. | Marin Jankovski | 2015-01-26 | 1 | -0/+83 | |
| | | | | ||||||
| | * | | Merge branch 'master' into move_external_issue_tracker_away_from_yml_config | Marin Jankovski | 2015-01-23 | 6 | -12/+26 | |
| | |\ \ | ||||||
| | * | | | Do a check which issue tracker is used inside the project. | Marin Jankovski | 2015-01-23 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | Added support for firing system hooks on group create/destroy and ↵ | Boyan Tabakov | 2015-01-27 | 1 | -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 error | Marco Wessel | 2015-01-25 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Allow configuring protection of the default branch upon first push | Marco Wessel | 2015-01-25 | 1 | -9/+10 | |
|/ / / | ||||||
* | | | Fix tests, merge conflicts, some minor issues and make the project avatar ↵ | Hannes Rosenögger | 2015-01-24 | 1 | -29/+29 | |
| | | | | | | | | | | | | feature mergable | |||||
* | | | adding avatar to project settings page added avatar removal show project ↵ | Steven Thonus | 2015-01-24 | 1 | -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 models | Dmitriy Zaporozhets | 2015-01-22 | 5 | -8/+26 | |
| | | ||||||
* | | Allow commit messages to close several issues at once (thanks @123Haynes | jubianchi | 2015-01-20 | 1 | -4/+0 | |
|/ | | | | for his work and help) | |||||
* | Fixed tests | Stefan Tatschner | 2015-01-15 | 1 | -1/+1 | |
| | ||||||
* | Fix test hook and tests | Dmitriy Zaporozhets | 2015-01-12 | 5 | -5/+5 | |
| | ||||||
* | Fix feature and tests | Dmitriy Zaporozhets | 2015-01-08 | 1 | -3/+1 | |
| | ||||||
* | Improve application settings and write tests | Dmitriy Zaporozhets | 2015-01-08 | 1 | -0/+7 | |
| | ||||||
* | Supporting for multiple omniauth provider for the same user | Valery Sizov | 2014-12-04 | 1 | -5/+11 | |
| | ||||||
* | Refactor merge request refresh logic on push | Dmitriy Zaporozhets | 2014-11-11 | 1 | -57/+0 | |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | Merge branch 'master' into mentioned_inside_mr | Dmitriy Zaporozhets | 2014-11-06 | 2 | -4/+3 | |
|\ | ||||||
| * | Merge branch 'gitlab-ci-parallel' into 'master' | Dmitriy Zaporozhets | 2014-11-05 | 1 | -2/+2 | |
| |\ | | | | | | | | | | | | | | | | Update GitLab CI service to work with new GitLab CI See merge request !1239 | |||||
| | * | Modify tests to match new gitlab_ci_service logic | Dmitriy Zaporozhets | 2014-11-05 | 1 | -2/+2 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | Merge pull request #8233 from cirosantilli/rm-new-branch-dead | Valeriy Sizov | 2014-11-05 | 1 | -1/+0 | |
| |\ \ | | | | | | | | | Remove dead Event#new_branch? method | |||||
| | * | | Remove dead Event#new_branch? method | Ciro Santilli | 2014-11-03 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | Merge pull request #8234 from cirosantilli/factor-0000 | Valeriy Sizov | 2014-11-05 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | Factor '0' * 40 blank ref constants [failure unrelated] | |||||
| | * | | | Factor '0' * 40 blank ref constants | Ciro Santilli | 2014-11-03 | 1 | -1/+1 | |
| | |/ / | ||||||
* | | | | Create a failing test where commit in mr creates a mr mention note. | Marin Jankovski | 2014-11-05 | 1 | -0/+6 | |
|/ / / | ||||||
* | | | Merge pull request #8222 from cirosantilli/concat-with-backslash | Robert Schilling | 2014-11-04 | 1 | -3/+3 | |
|\ \ \ | | | | | | | | | Continue strings with backslash instead of append | |||||
| * | | | Continue strings with backslash instead of append | Ciro Santilli | 2014-11-01 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | Merge branch 'master' into jastkand/gitlab-ce-fix-api-auth | Dmitriy Zaporozhets | 2014-11-03 | 2 | -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_url | Marin Jankovski | 2014-11-03 | 1 | -50/+6 | |
| |\ \ \ | | |_|/ | |/| | | update slack-notifier for new webhook_url format | |||||
| | * | | update slack-notifier to 1.0.0, use raw webhook_url per slack recommendation | Steven Sloan | 2014-10-23 | 1 | -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 path | Ciro Santilli | 2014-11-01 | 1 | -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 UI | Andrey Krivko | 2014-10-30 | 1 | -0/+14 | |
|/ / | ||||||
* | | Mentioned users are not limited by project scope any more | Dmitriy Zaporozhets | 2014-10-30 | 1 | -0/+14 | |
|/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | Add test for allowed team name of slack. | Marin Jankovski | 2014-10-21 | 1 | -0/+20 | |
| | ||||||
* | Merge tests to support Multiple LDAP groups | Jan-Willem van der Meer | 2014-10-13 | 1 | -0/+19 | |
| | ||||||
* | Merge branch 'sorting-users-in-admin' into 'master' | Dmitriy Zaporozhets | 2014-10-13 | 1 | -0/+28 | |
|\ | | | | | | | | | | | Sorting users in admin See merge request !1170 | |||||
| * | Admin: user sorting | Valery Sizov | 2014-10-13 | 1 | -0/+28 | |
| | | ||||||
* | | Fix tests | Dmitriy Zaporozhets | 2014-10-10 | 1 | -2/+2 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Use 8chars short sha for commit in views | Dmitriy Zaporozhets | 2014-10-10 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Use short_id instead of [0..N] for short version of commit sha | Dmitriy Zaporozhets | 2014-10-10 | 2 | -3/+3 | |
|/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | annotate | Valery Sizov | 2014-10-09 | 11 | -90/+89 | |
| | ||||||
* | Snippets: public/internal/private | Valery Sizov | 2014-10-09 | 1 | -0/+4 | |
| | ||||||
* | Merge branch 'master' into buildbox-service | Keith Pitt | 2014-10-08 | 7 | -12/+138 | |
|\ | | | | | | | | | Conflicts: app/models/project.rb | |||||
| * | Merge branch 'slack_integration' into 'master' | Dmitriy Zaporozhets | 2014-10-06 | 1 | -9/+25 | |
| |\ | | | | | | | | | | | | | | | | Slack integration See merge request !1151 | |||||
| | * | Accommodate new webhook url format. | Marin Jankovski | 2014-10-06 | 1 | -0/+21 | |
| | | | ||||||
| | * | Fix slack service speck. | Marin Jankovski | 2014-10-06 | 1 | -9/+4 | |
| | | |