summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Unblock user if they were unblocked in AD.Douwe Maan2015-03-131-1/+10
* Merge branch 'group-icon-performance' into 'master'Dmitriy Zaporozhets2015-03-122-18/+21
|\
| * Fix specsDmitriy Zaporozhets2015-03-122-18/+21
* | Block user if he/she was blocked in Active DirectoryDmitriy Zaporozhets2015-03-121-1/+6
|/
* Merge branch 'fix_email_images' into 'master'Douwe Maan2015-03-121-3/+79
|\
| * replace images in emails with inline imagesHannes Rosenögger2015-03-121-3/+79
* | Merge branch 'github-org-repos' into 'master'Dmitriy Zaporozhets2015-03-121-2/+5
|\ \ | |/ |/|
| * Fix missing GitHub organisation repositories on import page.Douwe Maan2015-03-121-2/+5
* | Fix tests for emojioneDmitriy Zaporozhets2015-03-111-3/+3
* | Merge branch 'fix-code-preview' into 'master'Marin Jankovski2015-03-111-0/+12
|\ \
| * | Fix code preview theme setting for comments, issues, merge requests, and snip...Stan Hu2015-03-101-0/+12
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-111-1/+2
|\ \ \
| * \ \ Merge branch 'master' into 'master'Hannes Rosenögger2015-03-111-1/+2
| |\ \ \
| | * | | Make email display name configurableVyacheslav Slinko2015-03-111-1/+2
* | | | | Rename dashboard landing page to Your projectsDmitriy Zaporozhets2015-03-101-2/+2
|/ / / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-102-0/+42
|\ \ \ \ | | |/ / | |/| |
| * | | This MR extends the commit calendar so it searches for commits made with ever...Stan Hu2015-03-092-0/+42
| |/ /
* | | Merge branch 'uploads-authorization' into 'master'Dmitriy Zaporozhets2015-03-101-0/+296
|\ \ \ | |_|/ |/| |
| * | Reject access to group/project avatar if the user doesn't have access.Douwe Maan2015-03-101-0/+296
| |/
* | Use Gitlab::Git helper methods and constants as much as possible.Douwe Maan2015-03-102-4/+4
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-091-9/+0
|\
| * fix mass SQL statements on initial pushHannes Rosenögger2015-03-091-9/+0
* | Move Profile groups tests to Dashboard group testsDmitriy Zaporozhets2015-03-082-59/+56
|/
* Merge branch 'emails-on-push'Dmitriy Zaporozhets2015-03-081-3/+56
|\
| * Fix EmailsOnPush comparison link to include first commit.Douwe Maan2015-02-251-1/+1
| * Fix EmailsOnPush to allow sending from @company.com for GitLab at gitlab.corp...Douwe Maan2015-02-251-4/+25
| * Send EmailsOnPush when deleting commits using force push.Douwe Maan2015-02-251-1/+1
| * Add option to send EmailsOnPush from committer email if domain matches.Douwe Maan2015-02-251-1/+29
| * Remove incorrect footer from EmailsOnPush body.Douwe Maan2015-02-251-0/+4
| * Change EmailsOnPush subject to include namespace, repo and branch.Douwe Maan2015-02-251-1/+1
* | Merge branch 'commit-range-reference' into 'master'Dmitriy Zaporozhets2015-03-082-0/+67
|\ \
| * | Automatically link commit ranges to compare page.Douwe Maan2015-03-072-0/+67
* | | Merge branch 'mass-change-comments' into 'master'Dmitriy Zaporozhets2015-03-071-18/+10
|\ \ \
| * | | Send notifications and leave system comments when bulk updating issues.Douwe Maan2015-03-061-18/+10
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-065-23/+74
|\ \ \ \
| * | | | Add tag_push event notification to HipChat and Slack services.Stan Hu2015-03-065-23/+74
| | |/ / | |/| |
* | | | Merge branch 'condensed-mr-commits' into 'master'Dmitriy Zaporozhets2015-03-071-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Condense commits already in target branch when updating merge request source ...Douwe Maan2015-03-061-1/+1
| |/ /
* | | Added comment notification events to HipChat and Slack services.Stan Hu2015-03-067-8/+413
|/ /
* | Add merge and issue event notification for HipChatStan Hu2015-03-051-0/+102
* | Re-annotate modelsDmitriy Zaporozhets2015-03-0414-132/+166
* | Merge branch 'add-more-slack-notifications' into 'master'Dmitriy Zaporozhets2015-03-0412-66/+237
|\ \
| * | Fix specs.Douwe Maan2015-03-031-3/+3
| * | Fix specs.Douwe Maan2015-03-033-8/+8
| * | Issue #595: Support Slack notifications upon issue and merge request eventsStan Hu2015-03-0312-61/+232
* | | Merge branch 'fix-namespace-merge-request-url' into 'master'Marin Jankovski2015-03-041-1/+1
|\ \ \
| * | | Fix URL builder to use GitlabRoutingHelperStan Hu2015-03-031-1/+1
* | | | Merge branch 'project-existence-leak' into 'master'Dmitriy Zaporozhets2015-03-031-0/+146
|\ \ \ \
| * | | | Add tests for GrackAuth.Douwe Maan2015-03-031-0/+146
* | | | | Merge branch 'go-import' into 'master'Marin Jankovski2015-03-031-0/+16
|\ \ \ \ \