summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2014-04-081-3/+10
|\
| * Merge branch 'master' into login_pageMarin Jankovski2014-04-074-23/+12
| |\
| * | Add option for disable standard signin.Marin Jankovski2014-04-071-3/+10
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-04-081-1/+1
|\ \ \
| * \ \ Merge branch 'grammer_fix' into 'master'Dmitriy Zaporozhets2014-04-071-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Fix project limit reached grammer.Josh Frye2014-04-041-1/+1
* | | | Merge pull request #6708 from skv-headless/fix_url_error_on_invalid_hookDmitriy Zaporozhets2014-04-071-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix url generation error on hook invalid createskv2014-04-061-1/+1
* | | | Allow people to remove source branch of fork project in MRDmitriy Zaporozhets2014-04-072-6/+6
* | | | Remove unnecessary sign *Dmitriy Zaporozhets2014-04-071-1/+1
* | | | Fix show/hide discussion linkDmitriy Zaporozhets2014-04-071-16/+5
| |_|/ |/| |
* | | Merge branch 'improve-oauth'Dmitriy Zaporozhets2014-04-076-4/+21
|\ \ \
| * | | Avoid false validation when create userDmitriy Zaporozhets2014-04-071-1/+1
| * | | Dont care about emails for oauthDmitriy Zaporozhets2014-04-071-2/+0
| * | | Skip require email for devise controllersDmitriy Zaporozhets2014-04-071-1/+1
| * | | Allow oauth signup without emailDmitriy Zaporozhets2014-04-075-2/+21
* | | | Improve actionability of notice.dosire2014-04-071-1/+2
* | | | Merge branch 'show_diff' into 'master'Dmitriy Zaporozhets2014-04-061-23/+24
|\ \ \ \ | |/ / / |/| | |
| * | | Only show diff it exists.Marin Jankovski2014-04-041-23/+24
* | | | Restyle merge request accept and ci widgetDmitriy Zaporozhets2014-04-0611-103/+133
| |/ / |/| |
* | | Merge pull request #6705 from razielgn/slack-service-attachmentsDmitriy Zaporozhets2014-04-062-6/+21
|\ \ \
| * | | Improved Slack integration with message attachments.Federico Ravasio2014-04-062-6/+21
* | | | Use normal btn size for test serviceDmitriy Zaporozhets2014-04-061-1/+1
* | | | Fix autocomplete cssDmitriy Zaporozhets2014-04-062-0/+19
* | | | Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlbo...Dmitriy Zaporozhets2014-04-064-5/+48
|\ \ \ \ | |/ / / |/| | |
| * | | Add button for removing source branch for merged MR's.Jacob Carlborg2013-12-195-6/+47
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-04-061-0/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'master' into request/relative_submodulesTimm Drevensek2014-04-0436-438/+376
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into request/relative_submodulesTimm Drevensek2014-04-0129-135/+263
| |\ \ \
| * \ \ \ Merge branch 'master' into request/relative_submodulesTimm Drevensek2014-03-26155-1269/+1308
| |\ \ \ \
| * | | | | simplify link urlTimm Drevensek2014-02-281-4/+3
| * | | | | fixed regex to match url pointing to a user repoTimm Drevensek2014-02-261-3/+3
| * | | | | Add support for relative submodulesTimm Drevensek2014-02-251-0/+17
* | | | | | Merge branch 'deduplicate-help' into 'master'Dmitriy Zaporozhets2014-04-041-10/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Reduce the number of times people send emails or file issues out of the blue.dosire2014-04-041-10/+2
* | | | | | Merge branch 'no_email_on_notification_level_change' into 'master'Dmitriy Zaporozhets2014-04-041-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Only send email when project access level changes.Marin Jankovski2014-04-031-1/+1
* | | | | | Add note when MR assignee changes. Add more tests to MR servicesDmitriy Zaporozhets2014-04-031-0/+4
* | | | | | Mention protected branch force pushDmitriy Zaporozhets2014-04-031-0/+1
|/ / / / /
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-032-4/+4
|\ \ \ \ \
| * \ \ \ \ Merge pull request #6639 from yatish27/ConsistentJSFormatDmitriy Zaporozhets2014-04-032-4/+4
| |\ \ \ \ \
| | * | | | | Consistent format for class objects in javascriptYatish Mehta2014-03-282-4/+4
* | | | | | | Merge branch 'reduce-observers' into 'master'Dmitriy Zaporozhets2014-04-0314-96/+164
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | More test fixesDmitriy Zaporozhets2014-04-031-0/+1
| * | | | | | Fix MR fork validation and services loadDmitriy Zaporozhets2014-04-033-2/+8
| * | | | | | Use MergeRequest services in API and controllersDmitriy Zaporozhets2014-04-024-26/+25
| * | | | | | MergeRequest services for create, update, close and reopenDmitriy Zaporozhets2014-04-025-0/+100
| * | | | | | Remove MergeRequest observerDmitriy Zaporozhets2014-04-021-43/+0
| * | | | | | Remove KeysObserverDmitriy Zaporozhets2014-04-022-19/+24
| * | | | | | Remove EmailsObserverDmitriy Zaporozhets2014-04-022-8/+8