summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Also update gitlab-workhorse in patch updates [ci skip]workhorse_in_patch_updateAchilleas Pipinellis2015-12-021-13/+32
|
* Merge branch 'rs-icon-link-transparency' into 'master' Dmitriy Zaporozhets2015-12-021-0/+0
|\ | | | | | | | | | | | | Make icon-link image transparent [ci skip] See merge request !1945
| * Make icon-link image transparentrs-icon-link-transparencyRobert Speicher2015-12-011-0/+0
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-024-2/+13
|\ \ | |/
| * Merge branch 'up-for-grabs' into 'master' Sytse Sijbrandij2015-12-012-0/+11
| |\ | | | | | | | | | | | | | | | | | | up for grabs label cc @dzaporozhets @razer6 See merge request !1938
| | * up for grabs labelup-for-grabsJob van der Voort2015-12-012-0/+11
| | |
| * | Merge branch 'install-guide-gitlab-shell-version' into 'master' Robert Speicher2015-12-012-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Install gitlab-shell 2.6.8 in installations from source [ci skip] See merge request !1932
| | * | 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 pull request #9846 from fbeegle/masterDmitriy Zaporozhets2015-12-021-1/+1
|\ \ \ \ | |/ / / |/| | | Update autocomplete_controller to be more readable
| * | | Update autocomplete_controller to be more readableFelipe Orlando2015-11-221-1/+1
| | | |
* | | | Merge branch 'ci-docs' into 'master' Kamil Trzciński2015-12-0114-63/+141
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CI quickstart guide This includes fixes suggested by @axil Fixes #3260 See merge request !1755
| * | | | Clean up quick start quide [ci skip]Achilleas Pipinellis2015-12-017-88/+42
| | | | | | | | | | | | | | | | | | | | | | | | | * Remove references to enabling CI since it it will be deprecated * Revert changes in yaml/README.md, refine it in a separate MR
| * | | | Remove old imagesAchilleas Pipinellis2015-12-013-0/+0
| | | | |
| * | | | Final touches for the quick start quideAchilleas Pipinellis2015-12-014-2/+4
| | | | |
| * | | | New images for the commit build statusAchilleas Pipinellis2015-12-014-2/+0
| | | | |
| * | | | Place images in their own dirAchilleas Pipinellis2015-12-0112-13/+11
| | | | |
| * | | | Add option to enable GitLab CI via .gitlab-ci.ymlAchilleas Pipinellis2015-12-011-6/+21
| | | | |
| * | | | Add section of enabling GitLab CIAchilleas Pipinellis2015-12-016-0/+31
| | | | |
| * | | | Clean up introAchilleas Pipinellis2015-12-011-2/+2
| | | | |
| * | | | update ci docs with yml reason and better quickstartJob van der Voort2015-12-012-76/+156
| | |/ / | |/| |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2015-12-013-3/+25
|\ \ \ \ | |/ / /
| * | | Merge branch 'upload_hook' into 'master' Valery Sizov2015-11-303-3/+25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fire update hook from GitLab https://gitlab.com/gitlab-org/gitlab-ce/issues/3069 See merge request !1882
| | * | | Fire update hook from GitLabValery Sizov2015-11-303-3/+25
| | | |/ | | |/|
* | | | Merge pull request #9868 from yms9654/commit-without-whitespaceStan Hu2015-12-013-1/+22
|\ \ \ \ | |/ / / |/| | | Add ignore whitespace change option to commit view
| * | | Add ignore whitespace change option to commit viewMinsik Yoon2015-12-013-1/+22
| | | |
* | | | Update CHANGELOGRobert Speicher2015-11-301-4/+7
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'stanhu/gitlab-ce-fix-404-after-project-removal'Robert Speicher2015-11-303-1/+18
|\ \ \ \ | | | | | | | | | | | | | | | See merge request !1916
| * | | | Fix 404 in redirection after removing a projectStan Hu2015-11-253-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9844 Closes #3559
* | | | | Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-3055-523/+566
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Rails update to 4.2.4 https://gitlab.com/gitlab-org/gitlab-ce/issues/2694 See merge request !1902
| * | | | 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` See merge request !1928
| * | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show Gmail actions links only on expected set of emails See merge request !1901
| | * | | | | | 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 ↵Dmitriy Zaporozhets2015-11-304-4/+30
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | https://gitlab.com/stanhu/gitlab-ce
| * | | | | | | Gracefully handle when Redis is not availableStan Hu2015-11-261-2/+7
| | | | | | | |
| * | | | | | | Expire application settings from cache at startupStan Hu2015-11-254-4/+25
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a DB migration occurs, there's a chance that the application settings are loaded from the cache and provide stale values, causing Error 500s. This ensures that at startup the settings are always refreshed. Closes #3643
* | | | | | | 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 page This is a regression introduced in 4d7f00f. Closes #3680 Closes https://github.com/gitlabhq/gitlabhq/issues/9861 Closes gitlab-org/gitlab-ee#90 See merge request !1909
| * | | | | | | Fix Error 500 when viewing user's personal projects from admin pageStan Hu2015-11-253-1/+15
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a regression introduced in 4d7f00f. Closes #3680
View Lorry Controller Status