summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* Don't allow a merge request to be merged when its title starts with "WIP".Douwe Maan2015-04-301-0/+26
|
* Revert "Added X-GitLab-Event header for web hooks"Valery Sizov2015-04-271-9/+5
| | | | This reverts commit 548f182814acd0f7a110e6c165c186e345901b00.
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-271-0/+120
|\
| * Rename `CommitRange#inclusive?` to `#exclude_start?`Robert Speicher2015-04-251-3/+3
| |
| * Remove CommitRange#to_aRobert Speicher2015-04-251-27/+0
| |
| * Include caret in CommitRange#reference_titleRobert Speicher2015-04-251-1/+5
| |
| * Remove param from CommitRange#to_sRobert Speicher2015-04-251-16/+4
| |
| * CommitRange improvementsRobert Speicher2015-04-251-2/+2
| |
| * Add CommitRange classRobert Speicher2015-04-251-0/+155
| |
* | Merge pull request #8644 from Bugagazavr/hook-eventsDmitriy Zaporozhets2015-04-271-5/+9
|\ \ | | | | | | Add X-GitLab-Event header for web hooks
| * | Added X-GitLab-Event header for web hooksbugagazavr2015-04-251-5/+9
| |/
* | Add notify and color options to HipchatServiceDominik Sander2015-04-261-0/+16
|/ | | | | | When notify is set to true send messages will trigger a notification for all room members. Color changes the background color of the message.
* Link cross-project cross-reference notes to correct project.Douwe Maan2015-04-241-11/+11
|
* No longer needed to pass project argument to commit methods.Douwe Maan2015-04-241-2/+2
|
* Use project.commit convenience method.Douwe Maan2015-04-242-4/+4
|
* Update mentionable shared examples to be (a bit) more understandableRobert Speicher2015-04-161-1/+1
|
* Correct usage of `subject` in specsRobert Speicher2015-04-164-5/+9
|
* Merge branch 'emailsonpush-hellip' into 'master'Dmitriy Zaporozhets2015-04-151-1/+1
|\ | | | | | | | | | | | | | | | | | | Don't use HTML ellipsis in EmailsOnPush subject truncated commit message. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2229. Since the page is encoded as UTF-8, we don't need HTML entities anymore and can just use the character. See merge request !521
| * Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.emailsonpush-hellipDouwe Maan2015-04-141-1/+1
| |
* | Follow newline guidelines.Douwe Maan2015-04-141-3/+0
| |
* | Remove duplication between Group and ProjectMember.Douwe Maan2015-04-141-2/+37
| |
* | Let invites be declined.Douwe Maan2015-04-141-0/+17
| |
* | Add invite logic to Member.Douwe Maan2015-04-141-0/+79
|/
* Merge branch 'rs-remove-invalid-key-factories' into 'master'Dmitriy Zaporozhets2015-04-141-4/+9
|\ | | | | | | | | | | | | | | Remove the invalid key factories They're only used once each, and they're easy to build in-place. See merge request !1766
| * Remove the invalid key factoriesRobert Speicher2015-04-111-4/+9
| | | | | | | | They're only used once each, and they're easy to build in-place.
* | Merge branch 'public-deploy-keys' into 'master'Dmitriy Zaporozhets2015-04-131-6/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow admin to create public deploy keys that are accessible to any project. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774. Project settings: ![Screen_Shot_2015-03-27_at_14.46.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01799ff912671ba6db3f828ea1aca1a6/Screen_Shot_2015-03-27_at_14.46.48.png) The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown. The list of projects below the public key has been changed to only show projects the user has access to. "Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys. Admin index: ![Screen_Shot_2015-03-27_at_14.47.06](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ea889d274cfd3f0694d47d602f4f3e94/Screen_Shot_2015-03-27_at_14.47.06.png) Admin detail page: ![Screen_Shot_2015-03-27_at_14.47.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8c8475e05bf6b497da3b9f1bc102329f/Screen_Shot_2015-03-27_at_14.47.16.png) Projects using the deploy key are listed on the left and can be disabled easily. See merge request !469
| * | Allow admin to create public deploy keys that are accessible to any project.Douwe Maan2015-04-031-6/+21
| | |
* | | Rename last uses of Buildbox to BuildkiteRobert Speicher2015-04-111-2/+2
| | |
* | | Move buildbox_service files to buildkite_serviceRobert Speicher2015-04-111-0/+0
| |/ |/|
* | CI forking: testsValery Sizov2015-04-061-0/+21
|/
* Merge branch 'username-period' into 'master'Dmitriy Zaporozhets2015-04-022-12/+10
|\ | | | | | | | | | | | | | | | | | | Don't allow username to end in period. The current behavior doesn't do username referencing and mentioning in sentences like "I discussed with with @douwe." since `douwe.` is matched as a username. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2174. See merge request !438
| * Move files for moved namespaces.Douwe Maan2015-03-311-2/+0
| |
| * Move User.cleanup_username to Namespace.cleanup_path.Douwe Maan2015-03-272-10/+10
| |
* | Merge branch 'email-full-url'Marin Jankovski2015-03-311-8/+9
|\ \
| * | Use relative URL for Markdown references, except in mails.email-full-urlDouwe Maan2015-03-271-7/+8
| | |
| * | Return full URLs from GitLabIssueTrackerService.Douwe Maan2015-03-271-7/+7
| |/
* | Move asana_service_spec to its correct locationRobert Speicher2015-03-271-0/+0
|/
* Renamed Buildbox to Buildkite.Keith Pitt2015-03-261-6/+6
|
* Merge branch 'improve-contributions-calendar' into 'master'Dmitriy Zaporozhets2015-03-231-38/+7
|\ | | | | | | | | | | | | | | | | | | | | Replace commits calendar with contributions calendar * count opening of issues and merge requests * dont trigger git repository - use events from database * count pushes instead of commits for faster and easier counting * much-much faster since does not affected by repository size See merge request !420
| * Refactor repository specsDmitriy Zaporozhets2015-03-221-38/+7
| |
* | Fix dots in Wiki slug causing errorsStan Hu2015-03-211-0/+41
|/ | | | Closes #1263, #431
* Link to CI with refValery Sizov2015-03-202-3/+3
|
* Fix cross references when usernames, milestones, or project names contain ↵Stan Hu2015-03-191-11/+142
| | | | | | underscores. Remove emphasis from system notes to avoid Markdown conflicts in names.
* Extend the commit calendar to show the actual commits for a dateHannes Rosenögger2015-03-181-2/+17
|
* Merge branch 'external_wiki' into 'master'Dmitriy Zaporozhets2015-03-181-0/+39
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for external wikis ## What does this MR do? This MR adds the possibility to replace the link to the internal wiki of gitlab with a custom link. Currently this is realised as a service. ## What Use Case does this MR solve? In my Company we already have a wiki System (Confluence). We have a policy to use the existing wiki, so we can't switch to the internal wiki Gitlab provides. This currently only leaves us two choices: 1. Disable the gitlab wiki. That means we completly loose the connection between wiki and code from the gitlab ui. 2. Create a simple wiki page with a link to our external wiki and hope that no one uses the internal one. Both solutions are not really good. So what can be done to improve the situation while making it as easy as possible for new developers to access both, wiki and gitlab? Replacing the wiki link kinda like the JIRA integration replaces the issues link looks like a good first step to me. :) This can probably be extended later to completly prevent access to the internal wiki (currently that's still possible if you know the link) or maybe to check if the link really points to a wiki. ## Screenshot: ![external_wiki_service](https://gitlab.com/uploads/gitlab-org/gitlab-ce/89b27cf068/external_wiki_service.png) See merge request !291
| * Add a service to support external wikisHannes Rosenögger2015-03-121-0/+39
| |
* | Delete deploy key when last connection to a project is destroyed.Douwe Maan2015-03-171-0/+33
| |
* | Merge branch 'fix-restricted-visibility' into 'master'Dmitriy Zaporozhets2015-03-161-11/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restricted visibility levels - bug fix and new feature This allows admin users to override restricted visibility settings when creating and updating projects and snippets, and moves the restricted visibility configuration from gitlab.yml to the web UI. See #1903. ## Move configuration location I added a new section to the application settings page for restricted visibility levels. Each level has a checkbox, styled with Bootstrap to look like a toggle button. A checked box means that the level is restricted. I added a glowing text shadow and changed the background color for checked buttons because the default styles made it hard to distinguish between checked and unchecked. This image shows the new section with the "Public" box checked: ![restricted_visibility_settings](https://dev.gitlab.org/Okada/gitlabhq/uploads/629562e4313f89b795e81c3bb0f95893/restricted_visibility_settings.png) ## Allow admins to override To allow admin users to override the restricted visibility levels, I had to remove the `visibility_level` validation from the `Project` class. The model doesn't know about the `current_user`, which should determine whether the restrictions can be overridden. We could use the creator in the validation, but that wouldn't work correctly for projects where a non-admin user is the creator and an admin tries to change the project to a restricted visibility level. The `Project::UpdateService` and `Project::CreateService` classes already had code to determine whether the current user is allowed to use a given visibility level; now all visibility level validation is done in those classes. Currently, when a non-admin tries to create or update a project using a restricted level, these classes silently set the visibility level to the global default (create) or the project's existing value (update). I changed this behavior to be more like an Active Model validation, where using a restricted level causes the entire request to be rejected. Project and personal snippets didn't have service classes, and restricted visibility levels weren't being enforced in the model or the controllers. The UI disabled radio buttons for restricted levels, but that wouldn't be difficult to circumvent. I created the `CreateSnippetService` and `UpdateSnippetService` classes to do the same restricted visibility check that the project classes do. And since I was dealing with snippet visibility levels, I updated the API endpoints for project snippets to allow users to set and update the visibility level. ## TODO * [x] Add more tests for restricted visibility functionality cc @sytse @dzaporozhets See merge request !1655
| * \ Merge branch 'master' into fix-restricted-visibilityVinnie Okada2015-03-143-4/+27
| |\ \ | | |/ | | | | | | | | | Conflicts: db/schema.rb
| * | Move restricted visibility settings to the UIVinnie Okada2015-03-071-11/+13
| | | | | | | | | | | | | | | Add checkboxes to the application settings page for restricted visibility levels, and remove those settings from gitlab.yml.
View Lorry Controller Status