summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8223 from cirosantilli/slack-require-spec-helperRobert Schilling2014-11-021-1/+1
|\
| * Use require spec_helper instead of relative pathCiro Santilli2014-11-011-1/+1
* | Merge pull request #8209 from naveda89/patch-1Robert Schilling2014-11-021-0/+1
|\ \
| * | Fixed markdown error in 7.3-to-7.4 update guideAlvaro Naveda2014-10-311-0/+1
| |/
* | Merge pull request #8217 from bbodenmiller/change-label-generationRobert Schilling2014-11-011-1/+0
|\ \
| * | remove feature labelBen Bodenmiller2014-10-311-1/+0
* | | Merge pull request #8213 from cirosantilli/factor-backend-shell-pathRobert Schilling2014-10-311-12/+20
|\ \ \
| * | | Factor lib backend gitlab shell pathCiro Santilli2014-10-311-12/+20
| | |/ | |/|
* | | Merge pull request #8211 from cirosantilli/rake-import-styleRobert Schilling2014-10-311-4/+3
|\ \ \ | |/ / |/| |
| * | Fix doc rake import md style [ci-skip]Ciro Santilli2014-10-311-4/+3
|/ /
* | Merge branch 'better-service-migration' into 'master'Dmitriy Zaporozhets2014-10-312-2/+2
|\ \
| * | Save only valid record in service migrationsDmitriy Zaporozhets2014-10-312-2/+2
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-311-0/+1
|\ \ \
| * \ \ Merge pull request #8205 from CromFr/masterDmitriy Zaporozhets2014-10-311-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Doc: Unicorn minimum worker_processes is 2Crom (Thibaut CHARLES)2014-10-301-0/+1
* | | | Merge branch 'api-delete-branch-json' into 'master'Dmitriy Zaporozhets2014-10-314-1/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Delete branch via API: doc updatedDmitriy Zaporozhets2014-10-301-0/+8
| * | | API delete branch: render branch name json instead of trueDmitriy Zaporozhets2014-10-303-1/+6
* | | | Merge branch 'improve_rake_import_doc' into 'master'Sytse Sijbrandij2014-10-301-15/+33
|\ \ \ \ | |_|/ / |/| | |
| * | | Modified according to suggestions by @sytsePatricio Cano2014-10-301-30/+5
| * | | Fixed typoPatricio Cano2014-10-301-2/+2
| * | | Corrected layout, to be more friendly.Patricio Cano2014-10-301-9/+9
| * | | Corrected the wording of the documentation and the layout.Patricio Cano2014-10-301-16/+14
| * | | Added the satellites:create step, that might be necessary after the import.Patricio Cano2014-10-301-3/+11
| * | | Improved rake documentation for importing existing repositories with a rake t...Patricio Cano2014-10-291-7/+44
* | | | Revert "Change update recommendation" since it should be fixed withSytse Sijbrandij2014-10-301-9/+9
* | | | Merge pull request #8199 from dblessing/fix/serialize_migrationSytse Sijbrandij2014-10-301-1/+1
|\ \ \ \
| * | | | Fix serialize migrationDrew Blessing2014-10-301-1/+1
* | | | | Merge pull request #8122 from bbodenmiller/cleanup-time-zoneDmitriy Zaporozhets2014-10-301-5/+0
|\ \ \ \ \
| * | | | | cleanup time zone settingsBen Bodenmiller2014-10-211-5/+0
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-10-302-4/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'easyfix_in_contributing_md' into 'master'Sytse Sijbrandij2014-10-291-0/+2
| |\ \ \ \ \ \
| | * | | | | | Refer to easyfix issues in CONTRIBUTING.md.Achilleas Pipinellis2014-10-301-0/+2
| |/ / / / / /
| * | | | | | Merge branch 'update-gitlab-shell-to-corresponding-version' into 'master'Dmitriy Zaporozhets2014-10-291-4/+2
| |\ \ \ \ \ \
| | * | | | | | Don't update GitLab Shell to the latest version but to the corresponding vers...update-gitlab-shell-to-corresponding-versionSytse Sijbrandij2014-10-281-4/+2
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-309-20/+54
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Merge pull request #7850 from asedge/api_add_tag_messageDmitriy Zaporozhets2014-10-306-18/+47
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Create RepoTag Grape entity and present it when doing stuff with tags via API...Sean Edge2014-10-306-18/+47
| |/ / / / / /
| * | | | | | Merge pull request #8185 from bbodenmiller/patch-3Robert Schilling2014-10-301-0/+1
| |\ \ \ \ \ \
| | * | | | | | fix markdown formattingBen Bodenmiller2014-10-271-0/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #8194 from bbodenmiller/patch-9Robert Schilling2014-10-301-1/+1
| |\ \ \ \ \ \
| | * | | | | | ruby -> RubyBen Bodenmiller2014-10-291-1/+1
| * | | | | | | Merge pull request #8191 from bbodenmiller/patch-4Robert Schilling2014-10-301-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | fix git installationBen Bodenmiller2014-10-291-0/+1
| |/ / / / / /
| * | | | | | Merge pull request #7980 from mr-vinn/diff-renamesDmitriy Zaporozhets2014-10-291-1/+4
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Display renamed files in diff viewsVinnie Okada2014-10-061-1/+4
* | | | | | | Merge branch 'notify-on-mention-everywhere' into 'master'Dmitriy Zaporozhets2014-10-304-5/+17
|\ \ \ \ \ \ \
| * | | | | | | Add CHANGELOG entryDmitriy Zaporozhets2014-10-301-0/+1
| * | | | | | | Mentioned users are not limited by project scope any moreDmitriy Zaporozhets2014-10-303-5/+16
* | | | | | | | Add addressable explicitly to GemfileDmitriy Zaporozhets2014-10-302-0/+2