summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix specsui-stuffDouwe Maan2015-11-3011-29/+28
|
* "Browse Directory" > "Browse Dir"Douwe Maan2015-11-301-1/+1
|
* Revert debugging changeDouwe Maan2015-11-301-1/+1
|
* Fix specDouwe Maan2015-11-301-1/+1
|
* "CI build passed", not "CI build success"Douwe Maan2015-11-304-7/+18
|
* Fix padding around editor path, input and select box.Douwe Maan2015-11-303-20/+30
|
* Use full names in emoji tooltipDouwe Maan2015-11-301-1/+1
|
* Numerous UI improvementsDouwe Maan2015-11-30186-1087/+1279
|
* 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
* | | | Merge branch 'rs-clone-panel' into 'master' Dmitriy Zaporozhets2015-11-3011-76/+132
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add clipboard button for project clone panel Closes #3585 Project: ![Screen_Shot_2015-11-24_at_7.34.04_PM](/uploads/8bf73a2816f2525896023c36aea402bc/Screen_Shot_2015-11-24_at_7.34.04_PM.png) Wiki: ![Screen_Shot_2015-11-24_at_7.34.43_PM](/uploads/ddf400a1c979a1d8b535a34877cd6163/Screen_Shot_2015-11-24_at_7.34.43_PM.png) See merge request !1896
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | Also re-adds the `.clone` updating that was removed accidentally. Thanks, tests!
| * | | | Add clipboard button to project clone panelRobert Speicher2015-11-245-11/+15
| | | | | | | | | | | | | | | | | | | | Closes #3585
| * | | | Rework the copy_to_clipboard logicRobert Speicher2015-11-245-34/+55
| | | | | | | | | | | | | | | | | | | | It needed to be more flexible in how we set the target text or element.
| * | | | 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.0 See #2857 See merge request !1922
| * | | | | Bump jquery-turbolinks to ~> 2.1.0rs-update-jquery-turbolinksRobert Speicher2015-11-272-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | See #2857
* | | | | | Merge branch 'phantomjs' into 'master' Dmitriy Zaporozhets2015-11-301-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 fpmphantomjsAchilleas Pipinellis2015-11-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/axil/phantomjs-debian
| * | | | | Update phantomjs to 2.0.0Achilleas Pipinellis2015-11-291-2/+2
|/ / / / / | | | | | | | | | | | | | | | * Version 1.9 was removed from upstream Debian repos
* | | | | Merge branch 'remove-satellites-reference' into 'master' Achilleas Pipinellis2015-11-281-3/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove reverence to satellites Remove reference in backup docs See merge request !1923
| * | | | | 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 See merge request !1837
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Nginx workhorse upload limit See merge request !1919
| * | | | | Fix alignmentRobert Speicher2015-11-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that if we do not the declaration from "location /" wins.
* | | | | | 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
| | | | | | |
* | | | | | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqStan Hu2015-11-264-14/+18
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge pull request #9670 from janten/gravatar-retinaStan Hu2015-11-264-14/+18
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Add support for HiDPI displays in gravatar service
| | * | | | | Fix typoJan-Gerd Tenberge2015-11-011-1/+1
| | | | | | |
| | * | | | | Fix merge errorJan-Gerd Tenberge2015-10-231-1/+1
| | | | | | |
| | * | | | | Merge branch 'gitlabhq-master' into gravatar-retinaJan-Gerd Tenberge2015-10-22778-7454/+11695
| | |\ \ \ \ \
| | | * \ \ \ \ Fix merge errorJan-Gerd Tenberge2015-10-22778-7454/+11695
| | | |\ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge remote-tracking branch 'origin/master' into gravatar-retinaJan-Gerd Tenberge2015-10-221-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Update specJan-Gerd Tenberge2015-10-191-2/+2
| | | | | | | | |