summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7258 from presto53/fix_init_scripts_interpreterJacob Vosmaer2014-09-082-14/+14
|\
| * fix bash-ismPavel Novitskiy2014-07-041-1/+1
| * change bash to shPavel Novitskiy2014-07-042-13/+13
* | Merge branch 'gitlab-development-kit' into 'master'Dmitriy Zaporozhets2014-09-081-1/+2
|\ \
| * | Recommend the GitLab Development KitJacob Vosmaer2014-09-081-1/+2
* | | Merge branch 'create-hooks' into 'master'Dmitriy Zaporozhets2014-09-083-4/+4
|\ \ \
| * | | Use create-hooks instead of rewrite-hooks.shJacob Vosmaer2014-09-083-4/+4
| |/ /
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqSytse Sijbrandij2014-09-088-44/+115
|\ \ \ | |/ / |/| |
| * | Merge pull request #7583 from bbodenmiller/httpsSytse Sijbrandij2014-09-087-39/+58
| |\ \
| | * | simplify HTTPS setup detailsBen Bodenmiller2014-09-077-39/+58
| * | | Merge pull request #7580 from bbodenmiller/patch-7Sytse Sijbrandij2014-09-081-0/+17
| |\ \ \
| | * | | add optional nginx configs to make more secureBen Bodenmiller2014-09-071-0/+17
| * | | | Merge pull request #7668 from bbodenmiller/patch-15Robert Schilling2014-09-081-5/+40
| |\ \ \ \
| | * | | | add cleanup section to 5.0 upgrade guideBen Bodenmiller2014-09-081-5/+40
* | | | | | Merge branch 'name-it-centos' into 'master'Sytse Sijbrandij2014-09-081-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Mention that people should use the CentOS tools.Sytse Sijbrandij2014-09-031-3/+3
* | | | | | Merge pull request #7596 from bbodenmiller/patch-5Dmitriy Zaporozhets2014-09-081-0/+8
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | add current sign-in dateBen Bodenmiller2014-08-241-0/+8
* | | | | | Merge pull request #7696 from Zyphrax/masterDmitriy Zaporozhets2014-09-071-6/+0
|\ \ \ \ \ \
| * | | | | | Remove parent spacing. Fixes #7505Yvo van Beek2014-09-061-6/+0
* | | | | | | Merge pull request #7704 from randx/sample-fork-prDmitriy Zaporozhets2014-09-062-42/+2
|\ \ \ \ \ \ \
| * | | | | | | Switch from travis to semaphoreDmitriy Zaporozhets2014-09-061-42/+0
| * | | | | | | Semaphoreapp badgeDmitriy Zaporozhets2014-09-061-0/+2
|/ / / / / / /
* | | | | | | Fix tests for CIDmitriy Zaporozhets2014-09-062-12/+13
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-062-1/+7
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #7699 from mmrvka/master-pkgrRobert Schilling2014-09-051-0/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Added cmake and pkg-config as build dependency for pkgrMartin Mrvka2014-09-051-0/+6
| |/ / / / / /
| * | | | | | Merge pull request #7193 from dloman/masterDmitriy Zaporozhets2014-09-051-1/+1
| |\ \ \ \ \ \
| | * | | | | | added str-truncated to branch list to fix issue #7192Daniel Loman2014-09-011-1/+1
* | | | | | | | Merge branch 'mr-push-note' into 'master'Dmitriy Zaporozhets2014-09-052-3/+39
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Pluralize commit text for note when push to existing MRDmitriy Zaporozhets2014-09-051-1/+2
| * | | | | | | Add comment to merge request when new push happensDmitriy Zaporozhets2014-09-052-3/+38
|/ / / / / / /
* | | | | | | Merge pull request #7470 from bbodenmiller/patch-1Dmitriy Zaporozhets2014-09-051-4/+4
|\ \ \ \ \ \ \
| * | | | | | | change git to git bin pathBen Bodenmiller2014-08-301-4/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #7252 from unaheidi/masterDmitriy Zaporozhets2014-09-052-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Delete mailer queue because we don't use sidekiq_mailer gem and now the maile...ling.su2014-07-042-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #7658 from Razer6/refresh_labels_page_on_deleteDmitriy Zaporozhets2014-09-055-9/+32
|\ \ \ \ \ \ \
| * | | | | | | Show labels help message if last label is deletedRobert Schilling2014-09-045-9/+32
* | | | | | | | Fix tests by using non-exist tag namesDmitriy Zaporozhets2014-09-051-5/+5
* | | | | | | | Fix tag testsDmitriy Zaporozhets2014-09-052-2/+4
* | | | | | | | Explicit issues order in API. Fixes tests for mysql. Again :)Dmitriy Zaporozhets2014-09-041-1/+3
* | | | | | | | Merge pull request #7305 from asedge/annotated_tagsDmitriy Zaporozhets2014-09-049-14/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | Added annotated tags. Updated tag haml file and call to gitlab-shell. Updat...Sean Edge2014-09-049-14/+51
* | | | | | | | | Fix ugly project access iconsDmitriy Zaporozhets2014-09-042-15/+9
|/ / / / / / / /
* | | | | | | | Merge pull request #7677 from cirosantilli/factor-issue-mr-text-emailDmitriy Zaporozhets2014-09-043-12/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix missing to on reassign MR text email to unassigned.Ciro Santilli2014-09-033-12/+8
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #7678 from cirosantilli/factor-new-issue-edit-mrDmitriy Zaporozhets2014-09-043-62/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | Factor new issue and edit MR forms.Ciro Santilli2014-09-043-62/+41
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-09-045-5/+98
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'api/issues-filter-labels' into 'master'Dmitriy Zaporozhets2014-09-045-5/+98
| |\ \ \ \ \ \ \ \ \
View Lorry Controller Status