summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Fixes #6311: cp the init.d file locally instead of remoteJeroen van Baarsen2014-02-133-3/+3
| |/ / / / /
| * | | | | Merge pull request #6310 from jvanbaarsen/add-gitter-linkSytse Sijbrandij2014-02-131-0/+2
| |\ \ \ \ \
| | * | | | | Added gitter linkJeroen van Baarsen2014-02-131-0/+2
| | |/ / / /
| * | | | | Merge pull request #6258 from zzet/patch-6Dmitriy Zaporozhets2014-02-131-1/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add emoji images to asset load path.Andrew Kumanyaev2014-02-061-1/+3
* | | | | | Merge branch 'remove-backtics-in-anchor-text' into 'master'Dmitriy Zaporozhets2014-02-131-1/+1
|\ \ \ \ \ \
| * | | | | | Backticks are just confusing here.dosire2014-02-121-1/+1
* | | | | | | Merge branch 'mr_workflow' into 'master'Sytse Sijbrandij2014-02-131-0/+36
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Explanation MR workflow and authorizationJacob Vosmaer2014-02-131-0/+36
|/ / / / / /
* | | | | | Merge pull request #6274 from cirosantilli/leave-group-from-members-pageDmitriy Zaporozhets2014-02-1323-151/+430
|\ \ \ \ \ \
| * | | | | | User can leave group from group page.Ciro Santillli2014-02-1223-151/+430
* | | | | | | Update minor version upgrade guide get latest code section.Marin Jankovski2014-02-121-2/+14
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'markdown-styles' into 'master'Dmitriy Zaporozhets2014-02-121-3/+9
|\ \ \ \ \ \
| * | | | | | Markdown styles dependencies are optional.dosire2014-02-121-3/+9
|/ / / / / /
* | | | | | Merge branch 'remove-gem-button' into 'master'Dmitriy Zaporozhets2014-02-121-2/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Gemnasium makes us red even though we are not exposed to a JRuby bug.dosire2014-02-121-2/+0
|/ / / / /
* | | | | Merge branch 'refactor_compare' into 'master'Dmitriy Zaporozhets2014-02-129-20/+27
|\ \ \ \ \
| * | | | | Fix link for MR diff downloadDmitriy Zaporozhets2014-02-121-5/+7
| * | | | | Improve compare logic for EmailOnPush serviceDmitriy Zaporozhets2014-02-124-2/+13
| * | | | | Use gitlab_git 5.4.0 without BROKEN_DIFF constantDmitriy Zaporozhets2014-02-124-13/+7
* | | | | | Merge branch 'markup-dependencies' into 'master'Dmitriy Zaporozhets2014-02-121-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add information about rich text format dependencies.dosire2014-02-121-0/+4
|/ / / / /
* | | | | Merge pull request #6298 from ralish/hipchat-spelling-fixDmitriy Zaporozhets2014-02-121-1/+1
|\ \ \ \ \
| * | | | | Fix spelling of "GitLab" in HipChat serviceSamuel D. Leslie2014-02-121-1/+1
* | | | | | Merge pull request #5520 from gabetax/rake_group_bulk_add_permissionsDmitriy Zaporozhets2014-02-122-0/+40
|\ \ \ \ \ \
| * | | | | | add rake gitlab:import: all_users_to_all_groups and user_to_groupsGabe Martin-Dempesy2013-11-022-0/+40
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-02-122-2/+2
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fix-projects-spelling' into 'master'Sytse Sijbrandij2014-02-112-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Fix spelling of plural project (projects and not project's).Pixelindustries2014-02-112-2/+2
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-02-123-1/+56
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge pull request #6297 from jojosch/user-public-ssh-keys-newlineDmitriy Zaporozhets2014-02-113-1/+56
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Split the user ssh keys by newline, not the characters "\n"Johannes Schleifenbaum2014-02-113-1/+56
* | | | | | | | Merge branch 'asset-path-in-scss' into 'master'Dmitriy Zaporozhets2014-02-121-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use rails image-url herlperDmitriy Zaporozhets2014-02-111-2/+2
* | | | | | | | Restore old padding for wiki blocksDmitriy Zaporozhets2014-02-116-19/+18
* | | | | | | | Merge branch 'header-anchors' of github.com:cirosantilli/gitlab-elearn into c...Dmitriy Zaporozhets2014-02-1127-127/+323
|\ \ \ \ \ \ \ \
| * | | | | | | | Headers have ids and link to their own id.Ciro Santillli2014-02-1127-127/+323
* | | | | | | | | Merge branch 'bug/gravatr_select2' into 'master'Dmitriy Zaporozhets2014-02-112-1/+4
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Dont use avatars for user select if avatar is disabledDmitriy Zaporozhets2014-02-112-1/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #6177 from cirosantilli/public-user-pagesDmitriy Zaporozhets2014-02-1119-71/+229
|\ \ \ \ \ \ \ \
| * | | | | | | | User pages are visible to users without loginCiro Santillli2014-02-1119-71/+229
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #5261 from devaroop/retrieve_ssh_keys_by_sshDmitriy Zaporozhets2014-02-116-0/+45
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | remove unwanted spaces, reduce diff, clean before mergeGitLab2014-02-111-3/+1
| * | | | | | | Merge branch 'retrieve_ssh_keys_by_ssh' of github.com:devaroop/gitlabhq into ...GitLab2014-02-111-1/+0
| |\ \ \ \ \ \ \
| | * | | | | | | update manual error in changelog while mergingDevaroop Bhattacharya2014-02-061-1/+0
| * | | | | | | | code refactor as per standardsGitLab2014-02-113-6/+9
| |/ / / / / / /
| * | | | | | | Update Gemfile.lockDevaroop Bhattacharya2014-02-061-0/+2
| * | | | | | | Update GemfileDevaroop Bhattacharya2014-02-061-1/+1
| * | | | | | | sync with upstream for ease to mergeGitLab2014-02-06920-8856/+17756
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ merge with upstream masterGitLab2014-02-06920-8852/+17752
| | |\ \ \ \ \ \ \