Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | | Update documentation on issue closing pattern. | Achilleas Pipinellis | 2015-03-30 | 2 | -3/+34 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #9023 from dantudor/patch-1 | Dmitriy Zaporozhets | 2015-03-31 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Allow ability to delete branches with '/` in name | |||||
| | * | | | | | | Added the missing comma | Dan Tudor | 2015-03-31 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | Allow ability to delete branches with '/` in name | Dan Tudor | 2015-03-25 | 1 | -3/+3 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'email-full-url' | Marin Jankovski | 2015-03-31 | 12 | -64/+117 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Use relative URL for Markdown references, except in mails.email-full-url | Douwe Maan | 2015-03-27 | 11 | -58/+111 | |
| | | | | | | | | ||||||
| * | | | | | | | Return full URLs from GitLabIssueTrackerService. | Douwe Maan | 2015-03-27 | 4 | -19/+19 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Better legend for contribution calendar pt2 :) | Dmitriy Zaporozhets | 2015-03-31 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Better legend for contribution calendar | Dmitriy Zaporozhets | 2015-03-31 | 1 | -3/+3 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'commits-count-badge' into 'master' | Dmitriy Zaporozhets | 2015-03-30 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added badge to commits tab Fixes #1261 See merge request !465 | |||||
| * | | | | | | | Added badge to commits tab | Phil Hughes | 2015-03-30 | 1 | -1/+3 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-03-30 | 3 | -2/+5 | |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge branch 'events-paginate' into 'master' | Douwe Maan | 2015-03-30 | 2 | -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 Leeuwen | 2015-03-24 | 2 | -5/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | self-implementation Also updated example request url Added changelog item | |||||
| * | | | | | | | Merge branch 'upgrade-dockerfile-7.9.1' into 'master' | Achilleas Pipinellis | 2015-03-30 | 1 | -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.1 | Stan Hu | 2015-03-30 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-03-30 | 2 | -7/+10 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge pull request #9056 from mavimo/patch-3 | Dmitriy Zaporozhets | 2015-03-30 | 1 | -6/+9 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix merge errors on CHANGELOG | |||||
| | * | | | | | | | | Fix merge errors on CHANGELOG | Marco Vito Moscaritolo | 2015-03-30 | 1 | -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-1 | Robert Schilling | 2015-03-30 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | LICENSE year update | |||||
| | * | | | | | | | LICENSE year update | Andrew | 2015-03-30 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Fix adding new members to group | Dmitriy Zaporozhets | 2015-03-30 | 3 | -1/+35 | |
|/ / / / / / / | ||||||
* | | | | | | | Include brakeman in rake test | Dmitriy Zaporozhets | 2015-03-29 | 1 | -0/+1 | |
| | | | | | | | ||||||
* | | | | | | | Refactor star btn logic for non-logged in user and fix tests | Dmitriy Zaporozhets | 2015-03-29 | 4 | -17/+26 | |
| | | | | | | | ||||||
* | | | | | | | Refactor star/fork buttons | Dmitriy Zaporozhets | 2015-03-29 | 5 | -24/+47 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'file-type' of https://github.com/Soullivaneuh/gitlabhq into ↵ | Dmitriy Zaporozhets | 2015-03-29 | 9 | -8/+171 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Soullivaneuh-file-type | |||||
| * | | | | | | | Improve file icons rendering on tree | Sullivan SENECHAL | 2015-03-28 | 9 | -8/+171 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-03-29 | 7 | -46/+33 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'repo-buttons' into 'master' | Dmitriy Zaporozhets | 2015-03-29 | 5 | -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 buttons | Phil Hughes | 2015-03-29 | 4 | -11/+18 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Moved download button into sidebar | Phil Hughes | 2015-03-29 | 2 | -10/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Star and fork buttons moved up | |||||
| | * | | | | | | | | Changed button type | Phil Hughes | 2015-03-27 | 2 | -3/+3 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Fork/Star button re-design | Phil Hughes | 2015-03-26 | 4 | -44/+17 | |
| | | |_|/ / / / / | | |/| | | | | | | ||||||
| * | | | | | | | | Merge branch 'clear-note-form-on-succcess' into 'master' | Dmitriy Zaporozhets | 2015-03-29 | 2 | -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-succcess | Douwe Maan | 2015-03-27 | 2 | -1/+9 | |
| | | |_|_|/ / / / | | |/| | | | | | | ||||||
* | | | | | | | | | Merge pull request #9041 from tsigo/rs-maintain-test-schema | Dmitriy Zaporozhets | 2015-03-29 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add ActiveRecord::Migration.maintain_test_schema! to spec_helper | |||||
| * | | | | | | | | | Add ActiveRecord::Migration.maintain_test_schema! to spec_helper | Robert Speicher | 2015-03-27 | 1 | -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-env | Dmitriy Zaporozhets | 2015-03-29 | 1 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Define GIT_TEMPLATE_DIR environment variable in TestEnv | |||||
| * | | | | | | | | | | Define GIT_TEMPLATE_DIR environment variable in TestEnv | Robert Speicher | 2015-03-27 | 1 | -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-collapse | Dmitriy Zaporozhets | 2015-03-29 | 1 | -8/+3 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Refactor sidebar JS logic | |||||
| * | | | | | | | | | | Simplify toggle-nav-collapse JS | Robert Speicher | 2015-03-27 | 1 | -8/+3 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #9045 from tsigo/rs-move-asana-spec | Dmitriy Zaporozhets | 2015-03-29 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Move asana_service_spec to its correct location | |||||
| * | | | | | | | | | | Move asana_service_spec to its correct location | Robert Speicher | 2015-03-27 | 1 | -0/+0 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #9048 from NARKOZ/api | Dmitriy Zaporozhets | 2015-03-29 | 1 | -4/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | properly paginate project events in API | |||||
| * | | | | | | | | | properly paginate project events in API | Nihad Abbasov | 2015-03-29 | 1 | -4/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-03-29 | 4 | -136/+5 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge pull request #9047 from NARKOZ/patch-7 | Nihad Abbasov | 2015-03-29 | 3 | -135/+4 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | update acts-as-taggable-on | |||||
| | * | | | | | | | | update acts-as-taggable-on | Nihad Abbasov | 2015-03-29 | 3 | -135/+4 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Merge pull request #9043 from skburgart/fix/merge-wording | Robert Schilling | 2015-03-28 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | Change merging notification to sound more natural | |||||
| | * | | | | | | | Change merging notification to sound more natural | Steven Burgart | 2015-03-27 | 1 | -1/+1 | |
| | |/ / / / / / |