summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added USE_DB env var to allow loading fake settings without db running.use_db_for_application_settingsMarin Jankovski2015-09-012-2/+15
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-09-011-1/+1
|\
| * Merge branch 'master' into 'master'Valery Sizov2015-09-011-1/+1
| |\
| | * Update Racc to 1.4.12Yorick Peterse2015-08-251-1/+1
* | | Merge branch 'add-commands' into 'master' Job van der Voort2015-09-011-0/+5
|\ \ \ | |/ / |/| |
| * | deleted additional infokaren Carias2015-08-311-3/+0
| * | added new commandskaren Carias2015-08-251-2/+0
| * | added new commandskaren Carias2015-08-252-0/+10
* | | Merge branch 'fix-branches-cache-after-merge' into 'master'Valery Sizov2015-09-013-1/+33
|\ \ \
| * | | Expire cache when merge request source branch was removedfix-branches-cache-after-mergeDmitriy Zaporozhets2015-08-283-1/+33
* | | | Merge branch 'oauth_token_with_ldap' into 'master'Dmitriy Zaporozhets2015-09-012-2/+2
|\ \ \ \
| * | | | retrieving oauth token with LDAP credentialsoauth_token_with_ldapValery Sizov2015-08-312-2/+2
| |/ / /
* | | | Merge branch 'fix-headers-blocking-anchors' into 'master'Dmitriy Zaporozhets2015-08-312-5/+8
|\ \ \ \
| * | | | Prevent anchors from being hidden by header upon a new page load.Stan Hu2015-08-292-5/+8
* | | | | Ordering of GitHub issues import is now fixedAchilleas Pipinellis2015-08-311-1/+1
* | | | | Merge branch 'dont-notify-users-without-project-access' into 'master'Robert Speicher2015-08-303-5/+18
|\ \ \ \ \
| * | | | | Don't notify users without access to the project when they are (accidentally)...dont-notify-users-without-project-accessDouwe Maan2015-08-263-5/+18
* | | | | | Merge branch 'joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993'Douwe Maan2015-08-295-4/+46
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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