summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Re-add EmailValidator to avoid the repetition of format: { with: Devise.email...streamline-email-validationRémy Coutable2016-02-095-6/+10
* Validate email addresses using Devise.email_regexpRémy Coutable2016-02-0911-58/+90
* Merge branch 'index_snippet' into 'master' Douwe Maan2016-02-092-1/+7
|\
| * Add index for snippet's updated_atindex_snippetValery Sizov2016-02-092-1/+7
* | Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master' Douwe Maan2016-02-094-11/+118
|\ \
| * | Add an API spec for MergeRequest#merge_status and properly document this reso...develop7/add-merge_status-to-merge-request-in-apiRémy Coutable2016-02-083-11/+117
| * | Expose MergeRequest::merge_status to APIAndrei Dziahel2016-02-081-0/+1
* | | Merge branch 'fix/max-attachment-size-setting-validation'Douwe Maan2016-02-093-0/+13
|\ \ \
| * | | Add Changelog entry for new maximum attachment size validatorfix/max-attachment-size-setting-validationGrzegorz Bizon2016-02-091-0/+1
| * | | Validate maximum attachment size in application settingsGrzegorz Bizon2016-02-092-0/+12
* | | | Merge branch 'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mai...Douwe Maan2016-02-0910-0/+65
|\ \ \ \
| * | | | Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mailJason Lee2016-02-0910-0/+65
* | | | | Merge branch '3kami3/gitlab-ce-root_email' into 'master' Douwe Maan2016-02-093-3/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add an option to supply root email through an environmental variable.3kami3/gitlab-ce-root_email3kami32016-02-083-3/+6
* | | | | Merge branch 'zj/gitlab-ce-unique-milestone-title-per-project'Douwe Maan2016-02-093-1/+16
|\ \ \ \ \
| * | | | | Validate uniqueness of milestone title per projectZeger-Jan van de Weg2016-02-083-1/+16
* | | | | | Merge branch 'add-tooltip-to-stuck-builds' into 'master' Douwe Maan2016-02-091-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add a tooltip to the stuck warning build symbolJeroen van Baarsen2016-02-081-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'fix/split-ci-jobs' into 'master' Douwe Maan2016-02-091-4/+85
|\ \ \ \ \
| * | | | | split gitlab-ci builds for ruby 2.1James Lopez2016-02-081-4/+85
* | | | | | Merge branch 'rs-broadcast-markdown' into 'master' Douwe Maan2016-02-0912-18/+87
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Allow limited Markdown in Broadcast Messagesrs-broadcast-markdownRobert Speicher2016-02-0612-18/+87
* | | | | | Merge branch 'increase_import_timeout' into 'master' Douwe Maan2016-02-093-2/+3
|\ \ \ \ \ \
| * | | | | | Increase project import timeout from 4 minutes to 15 minutesDrew Blessing2016-02-043-2/+3
* | | | | | | Merge branch 'fix/atom-url-issue' into 'master' Douwe Maan2016-02-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | remove unnecessary lower function on SQLJames Lopez2016-02-041-1/+1
* | | | | | | | update changelogValery Sizov2016-02-091-1/+1
* | | | | | | | Merge branch 'snippet_search_refactoring'Valery Sizov2016-02-094-30/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | trigger buildssnippet_search_refactoringValery Sizov2016-02-050-0/+0
| * | | | | | | | one more improvement to snippet searchValery Sizov2016-02-051-1/+1
| * | | | | | | | Faster snippet searchValery Sizov2016-02-054-29/+30
* | | | | | | | | Merge branch 'caching-repository-git-operations' into 'master' Yorick Peterse2016-02-096-6/+140
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cache various Repository Git operationscaching-repository-git-operationsYorick Peterse2016-02-086-6/+140
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ci/improve-ci-build-api' into 'master' Kamil Trzciński2016-02-092-93/+55
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Extract shared context level up in build specsci/improve-ci-build-apiGrzegorz Bizon2016-02-041-56/+17
| * | | | | | | | | Remove unmaintainable db schema comment from build factoryGrzegorz Bizon2016-02-041-27/+0
| * | | | | | | | | Improve CI API specs related to operations on buildGrzegorz Bizon2016-02-042-21/+49
* | | | | | | | | | Merge branch 'backup-database-timeout-fix' into 'master' Robert Speicher2016-02-081-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make sure there is a connection before using ActiveRecordbackup-database-timeout-fixJeroen Nijhof2016-02-081-0/+3
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'huacnlee/current-settings-autoload-bug-in-development' into 'ma...Robert Speicher2016-02-081-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix CurrentSettings autoload bug in development.huacnlee/current-settings-autoload-bug-in-developmentJason Lee2016-02-081-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'master' into 'master' Robert Schilling2016-02-081-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix grammar in installation requirements.Paul Johnson2016-02-081-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'fix-init' into 'master' Rémy Coutable2016-02-082-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed init.d script not working on OS Xritave2016-02-082-1/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'issues_12693' into 'master' Jacob Vosmaer2016-02-081-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | suppress only errors in init-script while determining canonical path of gitla...Harald Spaethe2016-02-081-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'kkm/gitlab-ce-user-diff-view-pref-cookie' into 'master' Rémy Coutable2016-02-085-1/+37
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add spec for assigning view param from cookiekkm/gitlab-ce-user-diff-view-pref-cookieRobert Speicher2016-02-051-5/+19
| * | | | | | | | Update CHANGELOGRobert Speicher2016-02-051-1/+1
View Lorry Controller Status