summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Move changelog itemjoelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-291-1/+1
* Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-29227-915/+4962
|\
| * Merge branch 'fix-session_expire_delay' into 'master'Stan Hu2015-08-281-1/+1
| |\
| | * fixed connection detection so settings can be read from the databaseEric Maziade2015-08-271-1/+1
| * | Merge branch 'make_all_profile_public' into 'master'Dmitriy Zaporozhets2015-08-275-18/+1
| |\ \
| | * | Make all profile publicmake_all_profile_publicValery Sizov2015-08-275-18/+1
| | |/
| * | Merge branch 'upgrade-gitlab-git-7.2.15' into 'master'Douwe Maan2015-08-273-3/+4
| |\ \
| | * | Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded filesStan Hu2015-08-273-3/+4
| |/ /
| * | Merge branch 'improve-mail_room-wrapper' into 'master'Douwe Maan2015-08-272-3/+34
| |\ \
| | * | Properly daemonize the mail_room processimprove-mail_room-wrapperJacob Vosmaer2015-08-272-3/+34
| * | | Merge branch 'rs-remove-user-color-scheme-class' into 'master'Douwe Maan2015-08-2723-97/+240
| |\ \ \ | | |/ / | |/| |
| | * | Make snippet_blob highlight server-side as wellrs-remove-user-color-scheme-classRobert Speicher2015-08-261-1/+1
| | * | Add user_color_scheme class to file_highlightRobert Speicher2015-08-261-1/+1
| | * | Re-add user_color_scheme helperRobert Speicher2015-08-262-24/+59
| | * | Add `count` to Themes and ColorSchemesRobert Speicher2015-08-262-0/+10
| | * | Add `Gitlab::Themes.for_user`Robert Speicher2015-08-261-0/+13
| | * | Fix two more failing specsRobert Speicher2015-08-251-3/+2
| | * | Fix failing specRobert Speicher2015-08-251-2/+2
| | * | Remove user_color_scheme_classRobert Speicher2015-08-2511-41/+21
| | * | Add highlight_word style definition to each color schemeRobert Speicher2015-08-256-4/+27
| | * | Add Gitlab::ColorSchemes moduleRobert Speicher2015-08-255-30/+113
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-2750-282/+335
| |\ \ \
| | * \ \ Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-08-2733-259/+235
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Add changelog itemsDmitriy Zaporozhets2015-08-271-0/+3
| | | * | Make search bar on search page more noticeableDmitriy Zaporozhets2015-08-275-12/+22
| | | * | More compact search pageDmitriy Zaporozhets2015-08-273-6/+5
| | | * | Use same snippets icon everywhere. Fix list style for bordered-listDmitriy Zaporozhets2015-08-272-1/+2
| | | * | Restyle snippets renderingDmitriy Zaporozhets2015-08-275-28/+34
| | | * | Fix 500 error when try to create project snippet without contentDmitriy Zaporozhets2015-08-261-3/+8
| | | * | Standartize how we render group rowsDmitriy Zaporozhets2015-08-264-38/+30
| | | * | Small improvements to center top menuDmitriy Zaporozhets2015-08-261-2/+1
| | | * | Remove unused cssDmitriy Zaporozhets2015-08-261-72/+0
| | | * | Refactor project list renderingDmitriy Zaporozhets2015-08-2615-94/+119
| | | * | Improve trending projects finderDmitriy Zaporozhets2015-08-261-5/+13
| | * | | Merge branch 'update-mail-room' into 'master'Robert Speicher2015-08-262-3/+3
| | |\ \ \
| | | * | | Update mail_roomupdate-mail-roomDouwe Maan2015-08-262-3/+3
| | * | | | Merge branch 'enable_ssl_verification_web_hook' into 'master'Dmitriy Zaporozhets2015-08-2615-16/+90
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Enable SSL verification for Webhooksenable_ssl_verification_web_hookValery Sizov2015-08-2615-16/+90
| | * | | | Merge branch 'update-changelog-for-7.14.1' into 'master'Robert Speicher2015-08-261-3/+3
| | |\ \ \ \
| | | * | | | Update CHANGELOG for released 7.14.1Stan Hu2015-08-261-3/+3
| | * | | | | Merge branch 'prevent-too-many-redirects-on-signin' into 'master'Dmitriy Zaporozhets2015-08-262-1/+4
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Prevent too many redirects error when home page URL set to external_urllStan Hu2015-08-262-1/+4
| * | | | | | Doesn't refer to participating in watch.Sytse Sijbrandij2015-08-261-1/+1
| |/ / / / /
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-2617-118/+105
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'fluid-fixed-layout' into 'master'Dmitriy Zaporozhets2015-08-2615-108/+90
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Fix header for anonymous users toofluid-fixed-layoutDmitriy Zaporozhets2015-08-261-6/+1
| | | * | | | Align header with content containerDmitriy Zaporozhets2015-08-266-81/+67
| | | * | | | Limit content width for big screens except certain pagesDmitriy Zaporozhets2015-08-2610-21/+22
| | * | | | | Merge branch 'blame_fix' into 'master'Dmitriy Zaporozhets2015-08-262-1/+2
| | |\ \ \ \ \
| | | * | | | | Improve perofrmance of git blameValery Sizov2015-08-262-1/+2
| | |/ / / / /