Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | Fixes #6311: cp the init.d file locally instead of remote | Jeroen van Baarsen | 2014-02-13 | 3 | -3/+3 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #6310 from jvanbaarsen/add-gitter-link | Sytse Sijbrandij | 2014-02-13 | 1 | -0/+2 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Added gitter link | Jeroen van Baarsen | 2014-02-13 | 1 | -0/+2 | |
| | |/ / / / | ||||||
| * | | | | | Merge pull request #6258 from zzet/patch-6 | Dmitriy Zaporozhets | 2014-02-13 | 1 | -1/+3 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Add emoji images to asset load path. | Andrew Kumanyaev | 2014-02-06 | 1 | -1/+3 | |
* | | | | | | Merge branch 'remove-backtics-in-anchor-text' into 'master' | Dmitriy Zaporozhets | 2014-02-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Backticks are just confusing here. | dosire | 2014-02-12 | 1 | -1/+1 | |
* | | | | | | | Merge branch 'mr_workflow' into 'master' | Sytse Sijbrandij | 2014-02-13 | 1 | -0/+36 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Explanation MR workflow and authorization | Jacob Vosmaer | 2014-02-13 | 1 | -0/+36 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #6274 from cirosantilli/leave-group-from-members-page | Dmitriy Zaporozhets | 2014-02-13 | 23 | -151/+430 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | User can leave group from group page. | Ciro Santillli | 2014-02-12 | 23 | -151/+430 | |
* | | | | | | | Update minor version upgrade guide get latest code section. | Marin Jankovski | 2014-02-12 | 1 | -2/+14 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge branch 'markdown-styles' into 'master' | Dmitriy Zaporozhets | 2014-02-12 | 1 | -3/+9 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Markdown styles dependencies are optional. | dosire | 2014-02-12 | 1 | -3/+9 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch 'remove-gem-button' into 'master' | Dmitriy Zaporozhets | 2014-02-12 | 1 | -2/+0 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Gemnasium makes us red even though we are not exposed to a JRuby bug. | dosire | 2014-02-12 | 1 | -2/+0 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'refactor_compare' into 'master' | Dmitriy Zaporozhets | 2014-02-12 | 9 | -20/+27 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix link for MR diff download | Dmitriy Zaporozhets | 2014-02-12 | 1 | -5/+7 | |
| * | | | | | Improve compare logic for EmailOnPush service | Dmitriy Zaporozhets | 2014-02-12 | 4 | -2/+13 | |
| * | | | | | Use gitlab_git 5.4.0 without BROKEN_DIFF constant | Dmitriy Zaporozhets | 2014-02-12 | 4 | -13/+7 | |
* | | | | | | Merge branch 'markup-dependencies' into 'master' | Dmitriy Zaporozhets | 2014-02-12 | 1 | -0/+4 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Add information about rich text format dependencies. | dosire | 2014-02-12 | 1 | -0/+4 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #6298 from ralish/hipchat-spelling-fix | Dmitriy Zaporozhets | 2014-02-12 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix spelling of "GitLab" in HipChat service | Samuel D. Leslie | 2014-02-12 | 1 | -1/+1 | |
* | | | | | | Merge pull request #5520 from gabetax/rake_group_bulk_add_permissions | Dmitriy Zaporozhets | 2014-02-12 | 2 | -0/+40 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | add rake gitlab:import: all_users_to_all_groups and user_to_groups | Gabe Martin-Dempesy | 2013-11-02 | 2 | -0/+40 | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2014-02-12 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'fix-projects-spelling' into 'master' | Sytse Sijbrandij | 2014-02-11 | 2 | -2/+2 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Fix spelling of plural project (projects and not project's). | Pixelindustries | 2014-02-11 | 2 | -2/+2 | |
| | | |_|_|/ / / | | |/| | | | | | ||||||
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-02-12 | 3 | -1/+56 | |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge pull request #6297 from jojosch/user-public-ssh-keys-newline | Dmitriy Zaporozhets | 2014-02-11 | 3 | -1/+56 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | Split the user ssh keys by newline, not the characters "\n" | Johannes Schleifenbaum | 2014-02-11 | 3 | -1/+56 | |
* | | | | | | | | Merge branch 'asset-path-in-scss' into 'master' | Dmitriy Zaporozhets | 2014-02-12 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Use rails image-url herlper | Dmitriy Zaporozhets | 2014-02-11 | 1 | -2/+2 | |
* | | | | | | | | Restore old padding for wiki blocks | Dmitriy Zaporozhets | 2014-02-11 | 6 | -19/+18 | |
* | | | | | | | | Merge branch 'header-anchors' of github.com:cirosantilli/gitlab-elearn into c... | Dmitriy Zaporozhets | 2014-02-11 | 27 | -127/+323 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Headers have ids and link to their own id. | Ciro Santillli | 2014-02-11 | 27 | -127/+323 | |
* | | | | | | | | | Merge branch 'bug/gravatr_select2' into 'master' | Dmitriy Zaporozhets | 2014-02-11 | 2 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Dont use avatars for user select if avatar is disabled | Dmitriy Zaporozhets | 2014-02-11 | 2 | -1/+4 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #6177 from cirosantilli/public-user-pages | Dmitriy Zaporozhets | 2014-02-11 | 19 | -71/+229 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | User pages are visible to users without login | Ciro Santillli | 2014-02-11 | 19 | -71/+229 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #5261 from devaroop/retrieve_ssh_keys_by_ssh | Dmitriy Zaporozhets | 2014-02-11 | 6 | -0/+45 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | remove unwanted spaces, reduce diff, clean before merge | GitLab | 2014-02-11 | 1 | -3/+1 | |
| * | | | | | | | Merge branch 'retrieve_ssh_keys_by_ssh' of github.com:devaroop/gitlabhq into ... | GitLab | 2014-02-11 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | update manual error in changelog while merging | Devaroop Bhattacharya | 2014-02-06 | 1 | -1/+0 | |
| * | | | | | | | | code refactor as per standards | GitLab | 2014-02-11 | 3 | -6/+9 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Update Gemfile.lock | Devaroop Bhattacharya | 2014-02-06 | 1 | -0/+2 | |
| * | | | | | | | Update Gemfile | Devaroop Bhattacharya | 2014-02-06 | 1 | -1/+1 | |
| * | | | | | | | sync with upstream for ease to merge | GitLab | 2014-02-06 | 920 | -8856/+17756 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | merge with upstream master | GitLab | 2014-02-06 | 920 | -8852/+17752 | |
| | |\ \ \ \ \ \ \ |