summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Auto-detect the required gitlab-shell versioninstall-guide-gitlab-shell-versionJacob Vosmaer2015-12-011-1/+1
* Install gitlab-shell 2.6.8Jacob Vosmaer2015-11-301-1/+1
* Use gitlab-shell 2.6.8 in update guideJacob Vosmaer2015-11-301-1/+1
* Merge branch 'upload_hook' into 'master' Valery Sizov2015-11-303-3/+25
|\
| * Fire update hook from GitLabValery Sizov2015-11-303-3/+25
* | Update CHANGELOGRobert Speicher2015-11-301-4/+7
* | Merge branch 'stanhu/gitlab-ce-fix-404-after-project-removal'Robert Speicher2015-11-303-1/+18
|\ \
| * | Fix 404 in redirection after removing a projectStan Hu2015-11-253-1/+18
* | | Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-3055-523/+566
|\ \ \ | |_|/ |/| |
| * | test fixValery Sizov2015-11-308-10/+25
| * | fix specsrails_update_to_4_2Valery Sizov2015-11-3017-81/+73
| * | fix notification_service specsValery Sizov2015-11-304-209/+144
| * | Migrate mailers to ActiveJobValery Sizov2015-11-2614-36/+67
| * | Merge remote-tracking branch 'origin/master' into rails_update_to_4_2Valery Sizov2015-11-2624-512/+472
| |\ \
| * | | update test_after_commit gem to 0.4.2Valery Sizov2015-11-262-3/+3
| * | | Rails update to 4.2.4Valery Sizov2015-11-2524-194/+264
* | | | 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
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-302-1/+66
|\ \ \ \ \
| * \ \ \ \ Merge branch 'gmail_actions_links_on_set_of_emails' into 'master' Dmitriy Zaporozhets2015-11-302-1/+66
| |\ \ \ \ \
| | * | | | | Remove some repetition in notify spec.gmail_actions_links_on_set_of_emailsMarin Jankovski2015-11-251-61/+32
| | * | | | | If action link is not found, return nil.Marin Jankovski2015-11-251-0/+2
| | * | | | | Specs for links in email notifications for Gmail Actions.Marin Jankovski2015-11-251-1/+93
* | | | | | | Merge branch 'expire-application-settings-startup' of https://gitlab.com/stan...Dmitriy Zaporozhets2015-11-304-4/+30
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Gracefully handle when Redis is not availableStan Hu2015-11-261-2/+7
| * | | | | | Expire application settings from cache at startupStan Hu2015-11-254-4/+25
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix-admin-page-personal-projects' into 'master' Dmitriy Zaporozhets2015-11-303-1/+15
|\ \ \ \ \ \
| * | | | | | Fix Error 500 when viewing user's personal projects from admin pageStan Hu2015-11-253-1/+15
| |/ / / / /
* | | | | | Merge branch 'rs-clone-panel' into 'master' Dmitriy Zaporozhets2015-11-3011-76/+132
|\ \ \ \ \ \
| * | | | | | Move project visibility level off of the clone panelrs-clone-panelRobert Speicher2015-11-273-8/+11
| * | | | | | Clean up the Git protocol switcher JSRobert Speicher2015-11-241-6/+14
| * | | | | | Add clipboard button to project clone panelRobert Speicher2015-11-245-11/+15
| * | | | | | Rework the copy_to_clipboard logicRobert Speicher2015-11-245-34/+55
| * | | | | | Move clipboard_button helper to ButtonHelper moduleRobert Speicher2015-11-242-8/+7
| * | | | | | Move HTTP/SSH clone button logic to helpersRobert Speicher2015-11-242-16/+37
* | | | | | | Merge branch 'rs-update-jquery-turbolinks' into 'master' Dmitriy Zaporozhets2015-11-302-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Bump jquery-turbolinks to ~> 2.1.0rs-update-jquery-turbolinksRobert Speicher2015-11-272-4/+4
* | | | | | | | Merge branch 'phantomjs' into 'master' Dmitriy Zaporozhets2015-11-301-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Test using a 1.9.8 phantomjs version built with fpmphantomjsAchilleas Pipinellis2015-11-291-2/+2
| * | | | | | | Update phantomjs to 2.0.0Achilleas Pipinellis2015-11-291-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'remove-satellites-reference' into 'master' Achilleas Pipinellis2015-11-281-3/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove reverence to satellites [ci skip]remove-satellites-referenceRobert Schilling2015-11-281-3/+0
|/ / / / / / /
* | | | | | | Merge branch 'doc_public_access' into 'master' Sytse Sijbrandij2015-11-281-18/+33
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update public access documentation [ci skip]Achilleas Pipinellis2015-11-191-18/+33
* | | | | | | Merge branch 'nginx-workhorse-upload-limit' into 'master' Robert Speicher2015-11-272-12/+24
|\ \ \ \ \ \ \
| * | | | | | | Fix alignmentRobert Speicher2015-11-271-6/+6
| * | | | | | | Fix indentation in NGINX confignginx-workhorse-upload-limitJacob Vosmaer2015-11-271-6/+6
| * | | | | | | Repeat "client_max_body_size 0" everywhereJacob Vosmaer2015-11-272-0/+12
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'jcorcuera/gitlab-ce-issue_3428'Douwe Maan2015-11-277-6/+62
|\ \ \ \ \ \ \
| * | | | | | | Strip attributes for Milestone and Issuable. #3428Jose Corcuera2015-11-267-6/+62