summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
| * | Switch to state_machines-activerecord (Fixes: #3374)Pirate Praveen2015-11-081-1/+1
* | | Merge remote-tracking branch 'origin/release-notes'Dmitriy Zaporozhets2015-11-101-1/+4
|\ \ \
| * | | Create show page for tag and render release notes there and on index pageDmitriy Zaporozhets2015-11-051-2/+2
| * | | More release related logic to separate resourceDmitriy Zaporozhets2015-11-051-1/+4
| * | | Add edit/update tag actions for future release notesDmitriy Zaporozhets2015-11-051-1/+1
* | | | Merge branch 'fix-incoming-email-default' into 'master' Robert Speicher2015-11-091-2/+2
|\ \ \ \
| * | | | Fix incoming email config defaultsfix-incoming-email-defaultDouwe Maan2015-11-091-2/+2
* | | | | Track the amount of times views are renderedYorick Peterse2015-11-091-0/+1
* | | | | Added Sherlock, a custom profiling tool for GitLabYorick Peterse2015-11-094-10/+54
|/ / / /
* | | | Enable shared runners for all new projectsKamil Trzcinski2015-11-051-4/+5
| |/ / |/| |
* | | CI details cleanupKamil Trzcinski2015-11-051-4/+5
|/ /
* | Merge branch 'facebook-auth' into 'master' Robert Speicher2015-11-041-11/+12
|\ \
| * | Add Facebook authenticationDouwe Maan2015-11-031-11/+12
* | | Replace all usages of `git` command with configurable binary pathrs-git-bin-pathRobert Speicher2015-11-031-3/+3
|/ /
* | Remove inflector rule that makes commits uncountableDmitriy Zaporozhets2015-11-031-21/+0
* | Merge branch 'shared-file-access' into 'master' Dmitriy Zaporozhets2015-10-292-1/+9
|\ \
| * | Start putting shared files in "shared"Jacob Vosmaer2015-10-262-1/+9