summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Allow primary email to be set to an email that you've already added.change-primary-emailDouwe Maan2015-04-302-7/+26
|
* Merge branch 'rs-issue-2269' into 'master'Dmitriy Zaporozhets2015-04-281-5/+0
|\ | | | | | | | | | | | | | | Remove duplicate settings for default_url_options Closes #2269 See merge request !1797
| * Remove duplicate settings for default_url_optionsRobert Speicher2015-04-251-5/+0
| | | | | | | | Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2269
* | Merge pull request #8645 from chulkilee/hipchat-api-versionDmitriy Zaporozhets2015-04-271-2/+4
|\ \ | | | | | | Add api version property on hipchat service
| * | Add api version property on hipchat serviceChulki Lee2015-04-271-2/+4
| | |
* | | Revert "Added X-GitLab-Event header for web hooks"Valery Sizov2015-04-272-12/+6
|/ / | | | | | | This reverts commit 548f182814acd0f7a110e6c165c186e345901b00.
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-272-4/+120
|\ \
| * \ Merge branch 'forked-event' into 'master'Dmitriy Zaporozhets2015-04-271-4/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Projects::CreateService to fork projects so that after-create hooks are run. Makes for cleaner code and less duplication, and causes the "User created project Namespace / Project" event to be posted and system hooks to be run. See merge request !575
| | * | Use Projects::CreateService to fork projects so that after-create hooks are run.forked-eventDouwe Maan2015-04-241-4/+14
| | | |
| * | | Rename `CommitRange#sha_from_as_param` to `#suffixed_sha_from`rs-refactor-reference-extractorRobert Speicher2015-04-251-4/+4
| | | |
| * | | Rename `CommitRange#inclusive?` to `#exclude_start?`Robert Speicher2015-04-251-14/+12
| | | |
| * | | Remove CommitRange#to_aRobert Speicher2015-04-251-13/+0
| | | |
| * | | Include caret in CommitRange#reference_titleRobert Speicher2015-04-251-1/+1
| | | |
| * | | Remove param from CommitRange#to_sRobert Speicher2015-04-251-6/+2
| | | |
| * | | CommitRange improvementsRobert Speicher2015-04-251-14/+11
| | | |
| * | | Add CommitRange classRobert Speicher2015-04-251-0/+128
| | |/ | |/|
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-273-8/+20
|\ \ \
| * \ \ Merge pull request #8644 from Bugagazavr/hook-eventsDmitriy Zaporozhets2015-04-272-6/+12
| |\ \ \ | | | | | | | | | | Add X-GitLab-Event header for web hooks
| | * | | Added X-GitLab-Event header for web hooksbugagazavr2015-04-252-6/+12
| | |/ /
| * | | Add notify and color options to HipchatServiceDominik Sander2015-04-261-2/+8
| |/ / | | | | | | | | | | | | | | | When notify is set to true send messages will trigger a notification for all room members. Color changes the background color of the message.
* | | Add new admin settingsVinnie Okada2015-04-261-1/+5
|/ / | | | | | | | | Add new global application settings for default project and snippet visibility levels.
* | Revert "Rename namespace_regex to namespace_path_regex."Douwe Maan2015-04-242-4/+4
| | | | | | | | This reverts commit c0116926c743818b2593474946abb40b56d8fefa.
* | Explain namespace clearn regex.Douwe Maan2015-04-241-0/+5
| |
* | Properly migrate users with usernames like "." or "..".Douwe Maan2015-04-241-1/+5
| |
* | Rename namespace_regex to namespace_path_regex.Douwe Maan2015-04-242-4/+4
|/
* Explain purpose and usage.Douwe Maan2015-04-241-0/+24
|
* Fix behavior for Enumerable-like ActiveRecord relations.Douwe Maan2015-04-241-3/+1
|
* Fix small issues.Douwe Maan2015-04-241-4/+4
|
* Satisfy Rubocop.Douwe Maan2015-04-241-11/+12
|
* Fix errors.Douwe Maan2015-04-241-2/+2
|
* Select MR commit notes from source project.Douwe Maan2015-04-241-3/+6
|
* Move participants method to shared Participable concern.Douwe Maan2015-04-245-43/+51
|
* Link cross-project cross-reference notes to correct project.Douwe Maan2015-04-242-36/+12
|
* No longer needed to pass project argument to commit methods.Douwe Maan2015-04-242-9/+9
|
* Use project.commit convenience method.Douwe Maan2015-04-243-4/+4
|
* Let commit model know about its project.Douwe Maan2015-04-245-13/+21
|
* Merge branch 'rs-mentionable-examples-refactor' into 'master'Dmitriy Zaporozhets2015-04-231-2/+2
|\ | | | | | | | | | | | | | | | | | | Update mentionable shared examples to be (a bit) more understandable These shared examples were super confusing, and honestly still kind of are, but they should be a bit better now. I encountered a bunch of headaches in these examples while refactoring ReferenceExtractor, so that's how I ended up changing it. See merge request !1780
| * Note#cross_reference_exists? should be checking the noteable_type alsoRobert Speicher2015-04-161-2/+2
| |
* | Merge pull request #9042 from skburgart/fix/jira-linkMarin Jankovski2015-04-231-6/+5
|\ \ | | | | | | Fix broken link in jira service
| * | Fix broken link in jira serviceSteven Burgart2015-03-271-6/+5
| | |
* | | Merge branch 'issue-body-code-mentions' into 'master'Dmitriy Zaporozhets2015-04-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug causing at-username inside code blocks to sometimes be picked up as a user mention. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2254. See merge request !553
| * | | Fix bug causing `@whatever` inside code blocks to sometimes be picked up as ↵issue-body-code-mentionsDouwe Maan2015-04-211-1/+1
| | | | | | | | | | | | | | | | a user mention.
* | | | do not send empty message to hipchatChulki Lee2015-04-221-2/+3
| | | |
* | | | Remove duplicate ampersand from Label title format validatorRobert Speicher2015-04-201-1/+1
|/ / /
* | | Merge branch 'better-commit-mentions' into 'master'Dmitriy Zaporozhets2015-04-205-14/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up code around commit mentions. Builds upon !527. See merge request !528
| * | | Clean up code somewhat.better-commit-mentionsDouwe Maan2015-04-173-13/+9
| | | |
| * | | Fix Snippet#participants.Douwe Maan2015-04-153-0/+4
| | | |
| * | | Include snippet author in recipients of snippet note notification.Douwe Maan2015-04-151-0/+12
| | | |
| * | | Clean up code around commit mentions.Douwe Maan2015-04-153-10/+21
| | | |
* | | | Fix label color input.fix-label-color-inputDouwe Maan2015-04-171-0/+2
| | | |