summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7967 from Bugagazavr/issue-actorValeriy Sizov2014-11-056-4/+25
|\
| * Add issueable actorKirill Zaitsev2014-10-056-4/+25
* | Merge pull request #8222 from cirosantilli/concat-with-backslashRobert Schilling2014-11-041-3/+3
|\ \
| * | Continue strings with backslash instead of appendCiro Santilli2014-11-011-3/+3
* | | Merge pull request #8182 from cirosantilli/dry-css-behaviorValeriy Sizov2014-11-041-8/+18
|\ \ \
| * | | Factor behaviors.scss constantsCiro Santilli2014-10-271-8/+18
* | | | Merge pull request #8196 from bbodenmiller/patch-12Valeriy Sizov2014-11-041-1/+2
|\ \ \ \
| * | | | clarify that 'template1=#' is part of promptBen Bodenmiller2014-10-291-1/+2
* | | | | Merge pull request #8197 from bbodenmiller/patch-14Valeriy Sizov2014-11-041-0/+3
|\ \ \ \ \
| * | | | | Quit the database session at end of database setupBen Bodenmiller2014-10-301-0/+3
| |/ / / /
* | | | | Merge pull request #8224 from liammonahan/masterValeriy Sizov2014-11-043-4/+9
|\ \ \ \ \
| * | | | | Expose projects_limit through users API if UserFull.Liam Monahan2014-11-023-4/+9
* | | | | | Merge pull request #8241 from cirosantilli/rm-unneeded-backslashRobert Schilling2014-11-041-1/+1
|\ \ \ \ \ \
| * | | | | | Remove unneeded backslash: "\/" == "/"Ciro Santilli2014-11-041-1/+1
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-11-043-5/+11
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #8231 from cirosantilli/0000Dmitriy Zaporozhets2014-11-043-5/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Fix push not allowed to protected branch ifCiro Santilli2014-11-033-5/+11
| | |/ / / / / /
* | | | | | | | Merge branch 'jastkand/gitlab-ce-fix-api-auth' into 'master'Dmitriy Zaporozhets2014-11-046-3/+57
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into jastkand/gitlab-ce-fix-api-authDmitriy Zaporozhets2014-11-0332-145/+183
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'api-events-username' into 'master'Dmitriy Zaporozhets2014-11-034-0/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Update changelogDmitriy Zaporozhets2014-10-311-0/+2
| * | | | | | | | Expose author username in project events APIDmitriy Zaporozhets2014-10-313-0/+10
* | | | | | | | | Merge pull request #8156 from stevenosloan/update_slack_and_use_raw_webhook_urlMarin Jankovski2014-11-036-75/+33
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | update slack-notifier to 1.0.0, use raw webhook_url per slack recommendationSteven Sloan2014-10-236-75/+33
* | | | | | | | | 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