Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqv6.4.0.pre1 | Dmitriy Zaporozhets | 2013-12-02 | 6 | -36/+27 |
|\ | |||||
| * | Merge branch 'add-cookbook' of /home/git/repositories/gitlab/gitlabhq | Dmitriy Zaporozhets | 2013-12-02 | 1 | -16/+7 |
| |\ | |||||
| | * | Comprehensive list of installation methods. | Sytse Sijbrandij | 2013-11-30 | 1 | -16/+7 |
| | | | |||||
| * | | Merge branch 'make-gender-neutral' of /home/git/repositories/gitlab/gitlabhq | Dmitriy Zaporozhets | 2013-12-02 | 5 | -20/+20 |
| |\ \ | |||||
| | * | | We welcome everyone to contribute. | Sytse Sijbrandij | 2013-12-01 | 5 | -20/+20 |
| |/ / | |||||
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2013-12-02 | 8 | -42/+49 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge pull request #5724 from Popl7/add_thumbsup_thumbsdown_emoji_voting | Dmitriy Zaporozhets | 2013-12-01 | 2 | -2/+14 |
| |\ \ | | | | | | | | | Thumbsup and thumbsdown emoji should be counted when voting | ||||
| | * | | added thumbsup and thumsdown emoji voting with rspec tests | vagrant | 2013-11-28 | 2 | -2/+14 |
| | |/ | |||||
| * | | Merge pull request #5725 from Popl7/http_repo_link_on_public_acces | Dmitriy Zaporozhets | 2013-12-01 | 3 | -3/+24 |
| |\ \ | | | | | | | | | Correct url to pull puplic repos anonymously on project page | ||||
| | * | | showing as default http link for public repo when anonymous | Steven Thonus | 2013-11-29 | 3 | -3/+24 |
| | |/ | |||||
| * | | Merge pull request #5731 from bke-drewb/helpui | Dmitriy Zaporozhets | 2013-12-01 | 1 | -32/+6 |
| |\ \ | | | | | | | | | Improve Help navigation UI | ||||
| | * | | Improve Help navigation UI | Drew Blessing | 2013-11-29 | 1 | -32/+6 |
| | | | | | | | | | | | | | | | | Make hash keys symbols | ||||
| * | | | Merge pull request #5737 from Popl7/type_fix_for_project_network_graph | Sytse Sijbrandij | 2013-12-01 | 2 | -5/+5 |
| |\ \ \ | | |/ / | |/| | | type_fix_for_project_network_graph | ||||
| | * | | type_fix_for_project_network_graph | Steven Thonus | 2013-11-30 | 2 | -5/+5 |
| | |/ | |||||
* | | | Merge branch 'relative-url-needs-warning' of ↵ | Dmitriy Zaporozhets | 2013-11-30 | 3 | -3/+3 |
|\ \ \ | | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq | ||||
| * | | | Add warning back. | Sytse Sijbrandij | 2013-11-29 | 3 | -3/+3 |
| | |/ | |/| | |||||
* | | | Merge branch 'database_doc' of /home/git/repositories/gitlab/gitlabhq | Dmitriy Zaporozhets | 2013-11-30 | 2 | -4/+4 |
|\ \ \ | |||||
| * | | | Change the mysql user to git from gitlab. | Marin Jankovski | 2013-11-29 | 2 | -4/+4 |
| | |/ | |/| | |||||
* | | | Merge branch 'line-for-side-by-side-diff' of ↵ | Dmitriy Zaporozhets | 2013-11-30 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | | | | /home/git/repositories/gitlab/gitlabhq | ||||
| * | | Side-by-side in changelog. | Sytse Sijbrandij | 2013-11-29 | 1 | -0/+1 |
| |/ | |||||
* | | Merge branch 'drop_rjs_2' of /home/git/repositories/gitlab/gitlabhq | Dmitriy Zaporozhets | 2013-11-29 | 9 | -27/+43 |
|\ \ | |||||
| * | | Drop rjs from Issues#index | Dmitriy Zaporozhets | 2013-11-29 | 6 | -25/+29 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Drop rjs from Notes#index | Dmitriy Zaporozhets | 2013-11-29 | 4 | -9/+21 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Merge branch 'feature/repo_size_in_admin' of ↵ | Dmitriy Zaporozhets | 2013-11-29 | 3 | -2/+6 |
|\ \ \ | | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq | ||||
| * | | | Show bare repository size in admin area(projects page) | Dmitriy Zaporozhets | 2013-11-29 | 3 | -2/+6 |
| |/ / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Merge branch 'feature/readme_link' of /home/git/repositories/gitlab/gitlabhq | Dmitriy Zaporozhets | 2013-11-29 | 2 | -0/+13 |
|\ \ \ | |/ / |/| | | |||||
| * | | README link from project home page | Dmitriy Zaporozhets | 2013-11-29 | 2 | -0/+13 |
|/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Fix app theme being ignored for public projects | Dmitriy Zaporozhets | 2013-11-29 | 3 | -2/+3 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Merge pull request #5708 from jhollingsworth/feature/multiline-blob-select | Dmitriy Zaporozhets | 2013-11-29 | 3 | -9/+205 |
|\ \ | | | | | | | Enable multiline select for blobs. | ||||
| * | | Enable multiline select for blobs. | Jason Hollingsworth | 2013-11-27 | 3 | -9/+205 |
| | | | | | | | | | | | | | | | | | | Holding shift will allow users to click and select multiple lines. The behavior is similar to GitHub. Complete with tests. | ||||
* | | | Merge pull request #5726 from hbristow/retina_favicon | Dmitriy Zaporozhets | 2013-11-29 | 2 | -0/+0 |
|\ \ \ | |_|/ |/| | | Updated favicon.ico to include retina assets and migrated from GL to cat glyph | ||||
| * | | Updated favicon.ico to include retina assets and migrated from GL to cat glyph | Hilton Bristow | 2013-11-29 | 2 | -0/+0 |
|/ / | |||||
* | | Merge remote-tracking branch 'origin/side-by-side' | Dmitriy Zaporozhets | 2013-11-28 | 6 | -15/+14 |
|\ \ | | | | | | | | | | | | | | | | | | | Conflicts: CHANGELOG Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Button name has an upcase in it. | Sytse Sijbrandij | 2013-11-27 | 1 | -1/+1 |
| | | | |||||
| * | | Conventional naming for diff modes. | Sytse Sijbrandij | 2013-11-27 | 6 | -15/+15 |
| | | | |||||
* | | | Merge branch 'wiki-reference' of /home/git/repositories/gitlab/gitlabhq | Dmitriy Zaporozhets | 2013-11-28 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Wiki page url changed due to title cleanup. | Sytse Sijbrandij | 2013-11-27 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'auto_disable_color' of /home/git/repositories/gitlab/gitlabhq | Dmitriy Zaporozhets | 2013-11-28 | 1 | -0/+10 |
|\ \ \ | |||||
| * | | | Disable rake color output unless connected to TTY | Jacob Vosmaer | 2013-11-27 | 1 | -0/+10 |
| | | | | |||||
* | | | | Merge branch 'unofficial-is-unclear' of /home/git/repositories/gitlab/gitlabhq | Dmitriy Zaporozhets | 2013-11-28 | 3 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Unsupported is unclear. | Sytse Sijbrandij | 2013-11-28 | 3 | -3/+3 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'drop_rjs' of /home/git/repositories/gitlab/gitlabhq | Dmitriy Zaporozhets | 2013-11-28 | 12 | -21/+30 |
|\ \ \ \ | |||||
| * | | | | Drop rjs from Infinite scrolling | Dmitriy Zaporozhets | 2013-11-28 | 12 | -21/+30 |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Add internal projects to CHANGELOG | Dmitriy Zaporozhets | 2013-11-28 | 1 | -0/+1 |
|/ / / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Merge branch 'improve/show_issue_state' of ↵ | Dmitriy Zaporozhets | 2013-11-27 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq | ||||
| * | | | Show issue open state as label | Dmitriy Zaporozhets | 2013-11-27 | 1 | -1/+3 |
| | | | | |||||
* | | | | Capybara tests with first-child/last-child randomly fails so replaced with ↵ | Dmitriy Zaporozhets | 2013-11-27 | 1 | -10/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | alternative method Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge pull request #5701 from gitlabhq/feature/internal_projects | Dmitriy Zaporozhets | 2013-11-27 | 50 | -160/+988 |
|\ \ \ \ | |/ / / |/| | | | Feature: Internal projects | ||||
| * | | | Remove unnecessary \" symbols | Dmitriy Zaporozhets | 2013-11-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Restyle public access help page | Dmitriy Zaporozhets | 2013-11-27 | 1 | -27/+25 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> |