| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Auto-detect the required gitlab-shell versioninstall-guide-gitlab-shell-version | Jacob Vosmaer | 2015-12-01 | 1 | -1/+1 |
| | | |||||
| * | Install gitlab-shell 2.6.8 | Jacob Vosmaer | 2015-11-30 | 1 | -1/+1 |
| | | |||||
| * | Use gitlab-shell 2.6.8 in update guide | Jacob Vosmaer | 2015-11-30 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'upload_hook' into 'master' | Valery Sizov | 2015-11-30 | 3 | -3/+25 |
| |\ | | | | | | | | | | | | | Fire update hook from GitLab https://gitlab.com/gitlab-org/gitlab-ce/issues/3069 See merge request !1882 | ||||
| | * | Fire update hook from GitLab | Valery Sizov | 2015-11-30 | 3 | -3/+25 |
| | | | |||||
| * | | Update CHANGELOG | Robert Speicher | 2015-11-30 | 1 | -4/+7 |
| | | | | | | | | | [ci skip] | ||||
| * | | Merge branch 'stanhu/gitlab-ce-fix-404-after-project-removal' | Robert Speicher | 2015-11-30 | 3 | -1/+18 |
| |\ \ | | | | | | | | | | See merge request !1916 | ||||
| | * | | Fix 404 in redirection after removing a project | Stan Hu | 2015-11-25 | 3 | -1/+18 |
| | | | | | | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9844 Closes #3559 | ||||
| * | | | Merge branch 'rails_update_to_4_2' into 'master' | Valery Sizov | 2015-11-30 | 55 | -523/+566 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Rails update to 4.2.4 https://gitlab.com/gitlab-org/gitlab-ce/issues/2694 See merge request !1902 | ||||
| | * | | test fix | Valery Sizov | 2015-11-30 | 8 | -10/+25 |
| | | | | |||||
| | * | | fix specsrails_update_to_4_2 | Valery Sizov | 2015-11-30 | 17 | -81/+73 |
| | | | | |||||
| | * | | fix notification_service specs | Valery Sizov | 2015-11-30 | 4 | -209/+144 |
| | | | | |||||
| | * | | Migrate mailers to ActiveJob | Valery Sizov | 2015-11-26 | 14 | -36/+67 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'origin/master' into rails_update_to_4_2 | Valery Sizov | 2015-11-26 | 24 | -512/+472 |
| | |\ \ | |||||
| | * | | | update test_after_commit gem to 0.4.2 | Valery Sizov | 2015-11-26 | 2 | -3/+3 |
| | | | | | |||||
| | * | | | Rails update to 4.2.4 | Valery Sizov | 2015-11-25 | 24 | -194/+264 |
| | | | | | |||||
| * | | | | Merge branch 'rs-build-ssh-path-prefix' into 'master' | Douwe Maan | 2015-11-30 | 1 | -3/+5 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify `build_gitlab_shell_ssh_path_prefix` See merge request !1928 | ||||
| | * | | | | Simplify `build_gitlab_shell_ssh_path_prefix`rs-build-ssh-path-prefix | Robert Speicher | 2015-11-29 | 1 | -3/+5 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-11-30 | 2 | -1/+66 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'gmail_actions_links_on_set_of_emails' into 'master' | Dmitriy Zaporozhets | 2015-11-30 | 2 | -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_emails | Marin Jankovski | 2015-11-25 | 1 | -61/+32 |
| | | | | | | | | |||||
| | | * | | | | | If action link is not found, return nil. | Marin Jankovski | 2015-11-25 | 1 | -0/+2 |
| | | | | | | | | |||||
| | | * | | | | | Specs for links in email notifications for Gmail Actions. | Marin Jankovski | 2015-11-25 | 1 | -1/+93 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'expire-application-settings-startup' of ↵ | Dmitriy Zaporozhets | 2015-11-30 | 4 | -4/+30 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | https://gitlab.com/stanhu/gitlab-ce | ||||
| | * | | | | | | Gracefully handle when Redis is not available | Stan Hu | 2015-11-26 | 1 | -2/+7 |
| | | | | | | | | |||||
| | * | | | | | | Expire application settings from cache at startup | Stan Hu | 2015-11-25 | 4 | -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 Zaporozhets | 2015-11-30 | 3 | -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 page | Stan Hu | 2015-11-25 | 3 | -1/+15 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a regression introduced in 4d7f00f. Closes #3680 | ||||
| * | | | | | | Merge branch 'rs-clone-panel' into 'master' | Dmitriy Zaporozhets | 2015-11-30 | 11 | -76/+132 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add clipboard button for project clone panel Closes #3585 Project:  Wiki:  See merge request !1896 | ||||
| | * | | | | | | Move project visibility level off of the clone panelrs-clone-panel | Robert Speicher | 2015-11-27 | 3 | -8/+11 |
| | | | | | | | | |||||
| | * | | | | | | Clean up the Git protocol switcher JS | Robert Speicher | 2015-11-24 | 1 | -6/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also re-adds the `.clone` updating that was removed accidentally. Thanks, tests! | ||||
| | * | | | | | | Add clipboard button to project clone panel | Robert Speicher | 2015-11-24 | 5 | -11/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #3585 | ||||
| | * | | | | | | Rework the copy_to_clipboard logic | Robert Speicher | 2015-11-24 | 5 | -34/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It needed to be more flexible in how we set the target text or element. | ||||
| | * | | | | | | Move clipboard_button helper to ButtonHelper module | Robert Speicher | 2015-11-24 | 2 | -8/+7 |
| | | | | | | | | |||||
| | * | | | | | | Move HTTP/SSH clone button logic to helpers | Robert Speicher | 2015-11-24 | 2 | -16/+37 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'rs-update-jquery-turbolinks' into 'master' | Dmitriy Zaporozhets | 2015-11-30 | 2 | -4/+4 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump jquery-turbolinks to ~> 2.1.0 See #2857 See merge request !1922 | ||||
| | * | | | | | | | Bump jquery-turbolinks to ~> 2.1.0rs-update-jquery-turbolinks | Robert Speicher | 2015-11-27 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #2857 | ||||
| * | | | | | | | | Merge branch 'phantomjs' into 'master' | Dmitriy Zaporozhets | 2015-11-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new phantomjs source Version 1.9 was removed from upstream [Debian repos](http://ftp.de.debian.org/debian/pool/main/p/phantomjs/) so I [used fpm](https://gitlab.com/axil/phantomjs-debian) to build our own Debian packages. Fixes #3722 See merge request !1924 | ||||
| | * | | | | | | | Test using a 1.9.8 phantomjs version built with fpmphantomjs | Achilleas Pipinellis | 2015-11-29 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/axil/phantomjs-debian | ||||
| | * | | | | | | | Update phantomjs to 2.0.0 | Achilleas Pipinellis | 2015-11-29 | 1 | -2/+2 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | * Version 1.9 was removed from upstream Debian repos | ||||
| * | | | | | | | Merge branch 'remove-satellites-reference' into 'master' | Achilleas Pipinellis | 2015-11-28 | 1 | -3/+0 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove reverence to satellites Remove reference in backup docs See merge request !1923 | ||||
| | * | | | | | | | Remove reverence to satellites [ci skip]remove-satellites-reference | Robert Schilling | 2015-11-28 | 1 | -3/+0 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'doc_public_access' into 'master' | Sytse Sijbrandij | 2015-11-28 | 1 | -18/+33 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update public access documentation See merge request !1837 | ||||
| | * | | | | | | Update public access documentation [ci skip] | Achilleas Pipinellis | 2015-11-19 | 1 | -18/+33 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'nginx-workhorse-upload-limit' into 'master' | Robert Speicher | 2015-11-27 | 2 | -12/+24 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nginx workhorse upload limit See merge request !1919 | ||||
| | * | | | | | | | Fix alignment | Robert Speicher | 2015-11-27 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | | | | | Fix indentation in NGINX confignginx-workhorse-upload-limit | Jacob Vosmaer | 2015-11-27 | 1 | -6/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | Repeat "client_max_body_size 0" everywhere | Jacob Vosmaer | 2015-11-27 | 2 | -0/+12 |
| | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that if we do not the declaration from "location /" wins. | ||||
| * | | | | | | | Merge branch 'jcorcuera/gitlab-ce-issue_3428' | Douwe Maan | 2015-11-27 | 7 | -6/+62 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Strip attributes for Milestone and Issuable. #3428 | Jose Corcuera | 2015-11-26 | 7 | -6/+62 |
| | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |