summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mr-builds' into 'master' Dmitriy Zaporozhets2015-12-091-1/+2
|\
| * Move Builds tab to the endDouwe Maan2015-12-081-1/+1
| * Merge branch 'master' into mr-buildsDouwe Maan2015-12-082-1/+2
| |\
| * | Add Builds tab to MR detail pageDouwe Maan2015-12-081-0/+1
* | | Merge branch 'issue-closing-docs' into 'master' Robert Speicher2015-12-081-1/+1
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into issue-closing-docsissue-closing-docsDouwe Maan2015-12-083-0/+17
| |\ \ | | |/
| * | Update documentation about automatic issue closingDouwe Maan2015-12-071-1/+1
* | | Merge branch 'languages-graph' into 'master' Robert Speicher2015-12-081-0/+1
|\ \ \
| * | | Implement languages graph pageDmitriy Zaporozhets2015-12-081-0/+1
| | |/ | |/|
* | | Fix signin with OmniAuth providersfix-omniauth-signinDouwe Maan2015-12-081-1/+1
|/ /
* | Merge branch 'feature/sidekiq-cron' into 'master' Dmitriy Zaporozhets2015-12-073-0/+17
|\ \ | |/ |/|
| * Migrate from Sidetiq to Sidekiq-cronfeature/sidekiq-cronGabriel Mazetto2015-12-043-0/+17
* | Fix Error 500 when creating global milestones with Unicode charactersStan Hu2015-12-051-1/+1
* | Merge branch 'master' into link-refsDouwe Maan2015-12-031-1/+1
|\ \ | |/
| * Rails deprecation warning about log_levelValery Sizov2015-12-031-1/+1
* | Merge branch 'master' into link-refsDouwe Maan2015-12-0215-27/+33
|\ \ | |/
| * Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-3015-27/+33
| |\
| | * fix notification_service specsValery Sizov2015-11-301-0/+2
| | * Migrate mailers to ActiveJobValery Sizov2015-11-264-3/+7
| | * Rails update to 4.2.4Valery Sizov2015-11-2514-24/+24
* | | Have ClosingIssueExtractor recognize all referenced issuesDouwe Maan2015-11-301-1/+1
|/ /
* | Merge branch 'rs-build-ssh-path-prefix' into 'master' Douwe Maan2015-11-301-3/+5
|\ \
| * | Simplify `build_gitlab_shell_ssh_path_prefix`rs-build-ssh-path-prefixRobert Speicher2015-11-291-3/+5
| |/
* | Gracefully handle when Redis is not availableStan Hu2015-11-261-2/+7
* | Expire application settings from cache at startupStan Hu2015-11-251-0/+4
|/
* Merge branch 'sherlock-total-query-time' into 'master' Yorick Peterse2015-11-251-0/+1
|\
| * Added total query time to Sherlocksherlock-total-query-timeYorick Peterse2015-11-241-0/+1
* | Also fallback to a default value if none is set.session_expire_delay_cannot_be_nilMarin Jankovski2015-11-241-2/+2
* | Maybe rescue session_expire_delay by setting a default value.Marin Jankovski2015-11-241-0/+1
|/
* Expose artifacts pathci-artifacts-pathKamil Trzcinski2015-11-232-1/+14
* Merge branch 'lfs_default_and_backup' into 'master' Dmitriy Zaporozhets2015-11-202-2/+2
|\
| * Lfs on by default.Marin Jankovski2015-11-192-2/+2
* | award emojiValery Sizov2015-11-191-0/+4
|/
* Merge branch 'rs-revert-gh-9820' into 'master' Robert Speicher2015-11-171-1/+1
|\
| * Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"rs-revert-gh-9820Robert Speicher2015-11-161-1/+1
* | Create milestones in the groupDmitriy Zaporozhets2015-11-161-1/+1
|/
* Add support for git lfs.lfsMarin Jankovski2015-11-163-3/+16
* Disabling cache for test environmentValery Sizov2015-11-162-9/+13
* Merge branch 'impersonate' into 'master' Dmitriy Zaporozhets2015-11-141-1/+3
|\
| * refactor login as to be impersonation with better login/logoutJames Newton2015-10-291-1/+3
* | Expose CI enable option in project featuresKamil Trzcinski2015-11-132-0/+2
* | Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-listDmitriy Zaporozhets2015-11-121-1/+1
|\ \
| * | Avoid render edit_form in each notes.Jason Lee2015-11-121-1/+1
* | | Merge branch 'ci-deprecate-dumped-yaml' into 'master' Kamil Trzciński2015-11-121-1/+0
|\ \ \
| * | | Remove deprecated dumped yaml file generated from previous job definitionsci-deprecate-dumped-yamlKamil Trzcinski2015-11-101-1/+0
* | | | Merge branch 'artifacts' into 'master' Kamil Trzciński2015-11-112-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Final fixesKamil Trzcinski2015-11-101-1/+1
| * | | Implement Build ArtifactsKamil Trzcinski2015-11-102-0/+2
| |/ /
* | | Merge branch 'state-machine-to-state-machines-activerecord' into 'master' Dmitriy Zaporozhets2015-11-101-9/+0
|\ \ \ | |/ / |/| |
| * | remove state_machine_patch.rbPirate Praveen2015-11-091-9/+0