Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow primary email to be set to an email that you've already added.change-primary-email | Douwe Maan | 2015-04-30 | 2 | -7/+26 |
| | |||||
* | Merge branch 'rs-issue-2269' into 'master' | Dmitriy Zaporozhets | 2015-04-28 | 1 | -5/+0 |
|\ | | | | | | | | | | | | | | | Remove duplicate settings for default_url_options Closes #2269 See merge request !1797 | ||||
| * | Remove duplicate settings for default_url_options | Robert Speicher | 2015-04-25 | 1 | -5/+0 |
| | | | | | | | | Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2269 | ||||
* | | Merge pull request #8645 from chulkilee/hipchat-api-version | Dmitriy Zaporozhets | 2015-04-27 | 1 | -2/+4 |
|\ \ | | | | | | | Add api version property on hipchat service | ||||
| * | | Add api version property on hipchat service | Chulki Lee | 2015-04-27 | 1 | -2/+4 |
| | | | |||||
* | | | Revert "Added X-GitLab-Event header for web hooks" | Valery Sizov | 2015-04-27 | 2 | -12/+6 |
|/ / | | | | | | | This reverts commit 548f182814acd0f7a110e6c165c186e345901b00. | ||||
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-04-27 | 2 | -4/+120 |
|\ \ | |||||
| * \ | Merge branch 'forked-event' into 'master' | Dmitriy Zaporozhets | 2015-04-27 | 1 | -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-event | Douwe Maan | 2015-04-24 | 1 | -4/+14 |
| | | | | |||||
| * | | | Rename `CommitRange#sha_from_as_param` to `#suffixed_sha_from`rs-refactor-reference-extractor | Robert Speicher | 2015-04-25 | 1 | -4/+4 |
| | | | | |||||
| * | | | Rename `CommitRange#inclusive?` to `#exclude_start?` | Robert Speicher | 2015-04-25 | 1 | -14/+12 |
| | | | | |||||
| * | | | Remove CommitRange#to_a | Robert Speicher | 2015-04-25 | 1 | -13/+0 |
| | | | | |||||
| * | | | Include caret in CommitRange#reference_title | Robert Speicher | 2015-04-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Remove param from CommitRange#to_s | Robert Speicher | 2015-04-25 | 1 | -6/+2 |
| | | | | |||||
| * | | | CommitRange improvements | Robert Speicher | 2015-04-25 | 1 | -14/+11 |
| | | | | |||||
| * | | | Add CommitRange class | Robert Speicher | 2015-04-25 | 1 | -0/+128 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-04-27 | 3 | -8/+20 |
|\ \ \ | |||||
| * \ \ | Merge pull request #8644 from Bugagazavr/hook-events | Dmitriy Zaporozhets | 2015-04-27 | 2 | -6/+12 |
| |\ \ \ | | | | | | | | | | | Add X-GitLab-Event header for web hooks | ||||
| | * | | | Added X-GitLab-Event header for web hooks | bugagazavr | 2015-04-25 | 2 | -6/+12 |
| | |/ / | |||||
| * | | | Add notify and color options to HipchatService | Dominik Sander | 2015-04-26 | 1 | -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 settings | Vinnie Okada | 2015-04-26 | 1 | -1/+5 |
|/ / | | | | | | | | | Add new global application settings for default project and snippet visibility levels. | ||||
* | | Revert "Rename namespace_regex to namespace_path_regex." | Douwe Maan | 2015-04-24 | 2 | -4/+4 |
| | | | | | | | | This reverts commit c0116926c743818b2593474946abb40b56d8fefa. | ||||
* | | Explain namespace clearn regex. | Douwe Maan | 2015-04-24 | 1 | -0/+5 |
| | | |||||
* | | Properly migrate users with usernames like "." or "..". | Douwe Maan | 2015-04-24 | 1 | -1/+5 |
| | | |||||
* | | Rename namespace_regex to namespace_path_regex. | Douwe Maan | 2015-04-24 | 2 | -4/+4 |
|/ | |||||
* | Explain purpose and usage. | Douwe Maan | 2015-04-24 | 1 | -0/+24 |
| | |||||
* | Fix behavior for Enumerable-like ActiveRecord relations. | Douwe Maan | 2015-04-24 | 1 | -3/+1 |
| | |||||
* | Fix small issues. | Douwe Maan | 2015-04-24 | 1 | -4/+4 |
| | |||||
* | Satisfy Rubocop. | Douwe Maan | 2015-04-24 | 1 | -11/+12 |
| | |||||
* | Fix errors. | Douwe Maan | 2015-04-24 | 1 | -2/+2 |
| | |||||
* | Select MR commit notes from source project. | Douwe Maan | 2015-04-24 | 1 | -3/+6 |
| | |||||
* | Move participants method to shared Participable concern. | Douwe Maan | 2015-04-24 | 5 | -43/+51 |
| | |||||
* | Link cross-project cross-reference notes to correct project. | Douwe Maan | 2015-04-24 | 2 | -36/+12 |
| | |||||
* | No longer needed to pass project argument to commit methods. | Douwe Maan | 2015-04-24 | 2 | -9/+9 |
| | |||||
* | Use project.commit convenience method. | Douwe Maan | 2015-04-24 | 3 | -4/+4 |
| | |||||
* | Let commit model know about its project. | Douwe Maan | 2015-04-24 | 5 | -13/+21 |
| | |||||
* | Merge branch 'rs-mentionable-examples-refactor' into 'master' | Dmitriy Zaporozhets | 2015-04-23 | 1 | -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 also | Robert Speicher | 2015-04-16 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #9042 from skburgart/fix/jira-link | Marin Jankovski | 2015-04-23 | 1 | -6/+5 |
|\ \ | | | | | | | Fix broken link in jira service | ||||
| * | | Fix broken link in jira service | Steven Burgart | 2015-03-27 | 1 | -6/+5 |
| | | | |||||
* | | | Merge branch 'issue-body-code-mentions' into 'master' | Dmitriy Zaporozhets | 2015-04-23 | 1 | -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-mentions | Douwe Maan | 2015-04-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | a user mention. | ||||
* | | | | do not send empty message to hipchat | Chulki Lee | 2015-04-22 | 1 | -2/+3 |
| | | | | |||||
* | | | | Remove duplicate ampersand from Label title format validator | Robert Speicher | 2015-04-20 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'better-commit-mentions' into 'master' | Dmitriy Zaporozhets | 2015-04-20 | 5 | -14/+37 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up code around commit mentions. Builds upon !527. See merge request !528 | ||||
| * | | | Clean up code somewhat.better-commit-mentions | Douwe Maan | 2015-04-17 | 3 | -13/+9 |
| | | | | |||||
| * | | | Fix Snippet#participants. | Douwe Maan | 2015-04-15 | 3 | -0/+4 |
| | | | | |||||
| * | | | Include snippet author in recipients of snippet note notification. | Douwe Maan | 2015-04-15 | 1 | -0/+12 |
| | | | | |||||
| * | | | Clean up code around commit mentions. | Douwe Maan | 2015-04-15 | 3 | -10/+21 |
| | | | | |||||
* | | | | Fix label color input.fix-label-color-input | Douwe Maan | 2015-04-17 | 1 | -0/+2 |
| | | | |