summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | Update documentation on issue closing pattern.Achilleas Pipinellis2015-03-302-3/+34
| | | | | | | |
| * | | | | | | Merge pull request #9023 from dantudor/patch-1Dmitriy Zaporozhets2015-03-311-3/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Allow ability to delete branches with '/` in name
| | * | | | | | Added the missing commaDan Tudor2015-03-311-1/+1
| | | | | | | |
| | * | | | | | Allow ability to delete branches with '/` in nameDan Tudor2015-03-251-3/+3
| | | | | | | |
* | | | | | | | Merge branch 'email-full-url'Marin Jankovski2015-03-3112-64/+117
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use relative URL for Markdown references, except in mails.email-full-urlDouwe Maan2015-03-2711-58/+111
| | | | | | | |
| * | | | | | | Return full URLs from GitLabIssueTrackerService.Douwe Maan2015-03-274-19/+19
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Better legend for contribution calendar pt2 :)Dmitriy Zaporozhets2015-03-311-1/+1
| | | | | | |
* | | | | | | Better legend for contribution calendarDmitriy Zaporozhets2015-03-311-3/+3
| | | | | | |
* | | | | | | Merge branch 'commits-count-badge' into 'master'Dmitriy Zaporozhets2015-03-301-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added badge to commits tab Fixes #1261 See merge request !465
| * | | | | | | Added badge to commits tabPhil Hughes2015-03-301-1/+3
| | | | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-303-2/+5
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'events-paginate' into 'master'Douwe Maan2015-03-302-1/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Events paginate Updated the api method for /project/:id/events, to use the paginate method instead of limiting and offsetting the recent events in the method itself. This will also change the first page to be 1 instead of 0, but using 0 will still work and will give back the first page. This also add's the link headers (next/first/last). See merge request !267
| | * | | | | | Updated api method GET /projects/:id/events to use paginate instead of a ↵Stephan van Leeuwen2015-03-242-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | self-implementation Also updated example request url Added changelog item
| * | | | | | | Merge branch 'upgrade-dockerfile-7.9.1' into 'master'Achilleas Pipinellis2015-03-301-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Docker build to GitLab v7.9.1 Upgrade GitLab from v7.9.0 to v7.9.1. See merge request !476
| | * | | | | | | Bump Docker build to GitLab v7.9.1Stan Hu2015-03-301-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-302-7/+10
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #9056 from mavimo/patch-3Dmitriy Zaporozhets2015-03-301-6/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix merge errors on CHANGELOG
| | * | | | | | | | Fix merge errors on CHANGELOGMarco Vito Moscaritolo2015-03-301-6/+9
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | During merges (d554070a and 497fd75d) changelog was "damaged", I restored the tagged 7.9.1 and added the required changes about 7.10.0 (unreleased). I think we need to ensure all PR are rebased on master before merge.
| * | | | | | | | Merge pull request #9053 from firstrow/patch-1Robert Schilling2015-03-301-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | LICENSE year update
| | * | | | | | | LICENSE year updateAndrew2015-03-301-1/+1
| |/ / / / / / /
* | | | | | | | Fix adding new members to groupDmitriy Zaporozhets2015-03-303-1/+35
|/ / / / / / /
* | | | | | | Include brakeman in rake testDmitriy Zaporozhets2015-03-291-0/+1
| | | | | | |
* | | | | | | Refactor star btn logic for non-logged in user and fix testsDmitriy Zaporozhets2015-03-294-17/+26
| | | | | | |
* | | | | | | Refactor star/fork buttonsDmitriy Zaporozhets2015-03-295-24/+47
| | | | | | |
* | | | | | | Merge branch 'file-type' of https://github.com/Soullivaneuh/gitlabhq into ↵Dmitriy Zaporozhets2015-03-299-8/+171
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Soullivaneuh-file-type
| * | | | | | | Improve file icons rendering on treeSullivan SENECHAL2015-03-289-8/+171
| | | | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-297-46/+33
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'repo-buttons' into 'master'Dmitriy Zaporozhets2015-03-295-45/+24
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repo buttons Fixes #796 Moved the star & fork button to inline with the other buttons. See merge request !473
| | * | | | | | | | Alignment fixes for repo buttonsPhil Hughes2015-03-294-11/+18
| | | | | | | | | |
| | * | | | | | | | Moved download button into sidebarPhil Hughes2015-03-292-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Star and fork buttons moved up
| | * | | | | | | | Changed button typePhil Hughes2015-03-272-3/+3
| | | | | | | | | |
| | * | | | | | | | Fork/Star button re-designPhil Hughes2015-03-264-44/+17
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'clear-note-form-on-succcess' into 'master'Dmitriy Zaporozhets2015-03-292-1/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent note form from being cleared when submitting failed. When you try to submit a comment while you're not connected to the internet or while your connection is having trouble, the AJAX request would fail and the note would be deleted :cry: See merge request !468
| | * | | | | | | | Prevent note form from being cleared when submitting failed.clear-note-form-on-succcessDouwe Maan2015-03-272-1/+9
| | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | Merge pull request #9041 from tsigo/rs-maintain-test-schemaDmitriy Zaporozhets2015-03-291-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add ActiveRecord::Migration.maintain_test_schema! to spec_helper
| * | | | | | | | | Add ActiveRecord::Migration.maintain_test_schema! to spec_helperRobert Speicher2015-03-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New in Rails 4.1, this eliminates spec failures due to forgetting to run `db:test:prepare`.
* | | | | | | | | | Merge pull request #9044 from tsigo/rs-git-template-envDmitriy Zaporozhets2015-03-291-1/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Define GIT_TEMPLATE_DIR environment variable in TestEnv
| * | | | | | | | | | Define GIT_TEMPLATE_DIR environment variable in TestEnvRobert Speicher2015-03-271-1/+7
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://schacon.github.io/git/git-init.html#_template_directory Without this variable, any global git hooks a developer might have in ~/.git_template would be linked in the `.git/hooks` folder for every test repository that gets checked out by TestEnv, and would cause certain specs to fail due to pre-existing hook files.
* | | | | | | | | | Merge pull request #9040 from tsigo/rs-refactor-nav-collapseDmitriy Zaporozhets2015-03-291-8/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Refactor sidebar JS logic
| * | | | | | | | | | Simplify toggle-nav-collapse JSRobert Speicher2015-03-271-8/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #9045 from tsigo/rs-move-asana-specDmitriy Zaporozhets2015-03-291-0/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Move asana_service_spec to its correct location
| * | | | | | | | | | Move asana_service_spec to its correct locationRobert Speicher2015-03-271-0/+0
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #9048 from NARKOZ/apiDmitriy Zaporozhets2015-03-291-4/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | properly paginate project events in API
| * | | | | | | | | properly paginate project events in APINihad Abbasov2015-03-291-4/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-294-136/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #9047 from NARKOZ/patch-7Nihad Abbasov2015-03-293-135/+4
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | update acts-as-taggable-on
| | * | | | | | | | update acts-as-taggable-onNihad Abbasov2015-03-293-135/+4
| |/ / / / / / / /
| * | | | | | | | Merge pull request #9043 from skburgart/fix/merge-wordingRobert Schilling2015-03-281-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Change merging notification to sound more natural
| | * | | | | | | Change merging notification to sound more naturalSteven Burgart2015-03-271-1/+1
| | |/ / / / / /