Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added USE_DB env var to allow loading fake settings without db running.use_db_for_application_settings | Marin Jankovski | 2015-09-01 | 2 | -2/+15 |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Marin Jankovski | 2015-09-01 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'master' into 'master' | Valery Sizov | 2015-09-01 | 1 | -1/+1 |
| |\ | |||||
| | * | Update Racc to 1.4.12 | Yorick Peterse | 2015-08-25 | 1 | -1/+1 |
* | | | Merge branch 'add-commands' into 'master' | Job van der Voort | 2015-09-01 | 1 | -0/+5 |
|\ \ \ | |/ / |/| | | |||||
| * | | deleted additional info | karen Carias | 2015-08-31 | 1 | -3/+0 |
| * | | added new commands | karen Carias | 2015-08-25 | 1 | -2/+0 |
| * | | added new commands | karen Carias | 2015-08-25 | 2 | -0/+10 |
* | | | Merge branch 'fix-branches-cache-after-merge' into 'master' | Valery Sizov | 2015-09-01 | 3 | -1/+33 |
|\ \ \ | |||||
| * | | | Expire cache when merge request source branch was removedfix-branches-cache-after-merge | Dmitriy Zaporozhets | 2015-08-28 | 3 | -1/+33 |
* | | | | Merge branch 'oauth_token_with_ldap' into 'master' | Dmitriy Zaporozhets | 2015-09-01 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | retrieving oauth token with LDAP credentialsoauth_token_with_ldap | Valery Sizov | 2015-08-31 | 2 | -2/+2 |
| |/ / / | |||||
* | | | | Merge branch 'fix-headers-blocking-anchors' into 'master' | Dmitriy Zaporozhets | 2015-08-31 | 2 | -5/+8 |
|\ \ \ \ | |||||
| * | | | | Prevent anchors from being hidden by header upon a new page load. | Stan Hu | 2015-08-29 | 2 | -5/+8 |
* | | | | | Ordering of GitHub issues import is now fixed | Achilleas Pipinellis | 2015-08-31 | 1 | -1/+1 |
* | | | | | Merge branch 'dont-notify-users-without-project-access' into 'master' | Robert Speicher | 2015-08-30 | 3 | -5/+18 |
|\ \ \ \ \ | |||||
| * | | | | | Don't notify users without access to the project when they are (accidentally)...dont-notify-users-without-project-access | Douwe Maan | 2015-08-26 | 3 | -5/+18 |
* | | | | | | Merge branch 'joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993' | Douwe Maan | 2015-08-29 | 5 | -4/+46 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Move changelog itemjoelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993 | Douwe Maan | 2015-08-29 | 1 | -1/+1 |
| * | | | | | Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993 | Douwe Maan | 2015-08-29 | 227 | -915/+4962 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge branch 'fix-session_expire_delay' into 'master' | Stan Hu | 2015-08-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fixed connection detection so settings can be read from the database | Eric Maziade | 2015-08-27 | 1 | -1/+1 |
* | | | | | | | Merge branch 'make_all_profile_public' into 'master' | Dmitriy Zaporozhets | 2015-08-27 | 5 | -18/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make all profile publicmake_all_profile_public | Valery Sizov | 2015-08-27 | 5 | -18/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'upgrade-gitlab-git-7.2.15' into 'master' | Douwe Maan | 2015-08-27 | 3 | -3/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded files | Stan Hu | 2015-08-27 | 3 | -3/+4 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'improve-mail_room-wrapper' into 'master' | Douwe Maan | 2015-08-27 | 2 | -3/+34 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Properly daemonize the mail_room processimprove-mail_room-wrapper | Jacob Vosmaer | 2015-08-27 | 2 | -3/+34 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rs-remove-user-color-scheme-class' into 'master' | Douwe Maan | 2015-08-27 | 23 | -97/+240 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Make snippet_blob highlight server-side as wellrs-remove-user-color-scheme-class | Robert Speicher | 2015-08-26 | 1 | -1/+1 |
| * | | | | | | Add user_color_scheme class to file_highlight | Robert Speicher | 2015-08-26 | 1 | -1/+1 |
| * | | | | | | Re-add user_color_scheme helper | Robert Speicher | 2015-08-26 | 2 | -24/+59 |
| * | | | | | | Add `count` to Themes and ColorSchemes | Robert Speicher | 2015-08-26 | 2 | -0/+10 |
| * | | | | | | Add `Gitlab::Themes.for_user` | Robert Speicher | 2015-08-26 | 1 | -0/+13 |
| * | | | | | | Fix two more failing specs | Robert Speicher | 2015-08-25 | 1 | -3/+2 |
| * | | | | | | Fix failing spec | Robert Speicher | 2015-08-25 | 1 | -2/+2 |
| * | | | | | | Remove user_color_scheme_class | Robert Speicher | 2015-08-25 | 11 | -41/+21 |
| * | | | | | | Add highlight_word style definition to each color scheme | Robert Speicher | 2015-08-25 | 6 | -4/+27 |
| * | | | | | | Add Gitlab::ColorSchemes module | Robert Speicher | 2015-08-25 | 5 | -30/+113 |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-08-27 | 50 | -282/+335 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'ui-improvements' into 'master' | Dmitriy Zaporozhets | 2015-08-27 | 33 | -259/+235 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Add changelog items | Dmitriy Zaporozhets | 2015-08-27 | 1 | -0/+3 |
| | * | | | | | | Make search bar on search page more noticeable | Dmitriy Zaporozhets | 2015-08-27 | 5 | -12/+22 |
| | * | | | | | | More compact search page | Dmitriy Zaporozhets | 2015-08-27 | 3 | -6/+5 |
| | * | | | | | | Use same snippets icon everywhere. Fix list style for bordered-list | Dmitriy Zaporozhets | 2015-08-27 | 2 | -1/+2 |
| | * | | | | | | Restyle snippets rendering | Dmitriy Zaporozhets | 2015-08-27 | 5 | -28/+34 |
| | * | | | | | | Fix 500 error when try to create project snippet without content | Dmitriy Zaporozhets | 2015-08-26 | 1 | -3/+8 |
| | * | | | | | | Standartize how we render group rows | Dmitriy Zaporozhets | 2015-08-26 | 4 | -38/+30 |
| | * | | | | | | Small improvements to center top menu | Dmitriy Zaporozhets | 2015-08-26 | 1 | -2/+1 |
| | * | | | | | | Remove unused css | Dmitriy Zaporozhets | 2015-08-26 | 1 | -72/+0 |