Commit Graph
10629 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 946595a554 Merge branch 'line-for-side-by-side-diff' of /home/git/repositories/gitlab/gitlabhq 2013-11-30 08:05:08 +00:00
Tandrial b6e3f391e7 Update ruby.md
Trying to install the gem bundle without bundler fails with:
/usr/local/lib/ruby/2.0.0/rubygems/dependency.rb:296:in `to_specs': Could not find 'bundler' (>= 0) among 8 total gem(s) (Gem::LoadError)
        from /usr/local/lib/ruby/2.0.0/rubygems/dependency.rb:307:in `to_spec'
        from /usr/local/lib/ruby/2.0.0/rubygems/core_ext/kernel_gem.rb:47:in `gem'
        from /usr/local/bin/bundle:22:in `<main>'

Installing the bundler (with sudo gem install bundler) at the end of Step 4 fixes this.
2013-11-29 21:43:40 +01:00
Drew Blessing 23e36202d2 Improve Help navigation UI
Make hash keys symbols
2013-11-29 13:51:33 -06:00
Marin Jankovski 72e2fe2c8a Change the mysql user to git from gitlab. 2013-11-29 16:46:38 +01:00
Dmitriy Zaporozhets 477e9f87e1 Merge branch 'drop_rjs_2' of /home/git/repositories/gitlab/gitlabhq 2013-11-29 14:21:26 +00:00
Dmitriy Zaporozhets ff25cb934b Merge branch 'feature/repo_size_in_admin' of /home/git/repositories/gitlab/gitlabhq 2013-11-29 13:38:41 +00:00
Sytse Sijbrandij c5a339daf7 Side-by-side in changelog. 2013-11-29 14:23:48 +01:00
Dmitriy Zaporozhets 8a650f5d4a Merge branch 'feature/readme_link' of /home/git/repositories/gitlab/gitlabhq 2013-11-29 13:10:52 +00:00
Dmitriy Zaporozhets da10cad1da Drop rjs from Issues#index
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 15:05:32 +02:00
Dmitriy Zaporozhets 596e64e5d7 Drop rjs from Notes#index
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 14:46:40 +02:00
Dmitriy Zaporozhets 4492081142 Show bare repository size in admin area(projects page)
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 14:16:17 +02:00
Dmitriy Zaporozhets 81fe86b427 README link from project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 13:52:10 +02:00
Dmitriy Zaporozhets 071de30f80 Fix app theme being ignored for public projects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 13:31:57 +02:00
Steven Thonus 5907207e4d showing as default http link for public repo when anonymous 2013-11-29 09:32:34 +01:00
Dmitriy Zaporozhets db0c353a78 Merge pull request #5708 from jhollingsworth/feature/multiline-blob-select
Enable multiline select for blobs.
2013-11-29 00:18:34 -08:00
Dmitriy Zaporozhets 244db1eb54 Merge pull request #5726 from hbristow/retina_favicon
Updated favicon.ico to include retina assets and migrated from GL to cat glyph
2013-11-29 00:06:48 -08:00
Sytse Sijbrandij b8cb7df761 Add warning back. 2013-11-29 08:57:45 +01:00
Hilton Bristow 4c53d6f3db Updated favicon.ico to include retina assets and migrated from GL to cat glyph 2013-11-29 09:53:14 +10:00
vagrant 64efc05229 added thumbsup and thumsdown emoji voting with rspec tests 2013-11-28 20:05:37 +00:00
Dmitriy Zaporozhets 2e07865f16 Merge remote-tracking branch 'origin/side-by-side'
Conflicts:
	CHANGELOG

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-28 19:26:21 +02:00
Dmitriy Zaporozhets 20bcbc1956 Merge branch 'wiki-reference' of /home/git/repositories/gitlab/gitlabhq 2013-11-28 17:24:54 +00:00
Dmitriy Zaporozhets 73dde832c4 Merge branch 'auto_disable_color' of /home/git/repositories/gitlab/gitlabhq 2013-11-28 17:24:36 +00:00
Dmitriy Zaporozhets 98c792e0ee Merge branch 'unofficial-is-unclear' of /home/git/repositories/gitlab/gitlabhq 2013-11-28 17:23:54 +00:00
Jacob Vosmaer 376cfc6ac6 Give more information in rake gitlab:ldap:check 2013-11-28 18:12:30 +01:00
Jacob Vosmaer 47239aabef Refer to rake gitlab:ldap:check script 2013-11-28 18:12:12 +01:00
Jacob Vosmaer 9f4909faad Add LDAP check to rake gitlab:check 2013-11-28 15:20:40 +01:00
Dmitriy Zaporozhets 038b3049e8 Merge branch 'drop_rjs' of /home/git/repositories/gitlab/gitlabhq 2013-11-28 10:30:24 +00:00
Dmitriy Zaporozhets 33aea41708 Drop rjs from Infinite scrolling
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-28 11:38:20 +02:00
Dmitriy Zaporozhets 70c2e1d773 Add internal projects to CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-28 10:36:13 +02:00
Sytse Sijbrandij 22d3aa4e32 Unsupported is unclear. 2013-11-28 07:57:56 +01:00
Jason Hollingsworth 568e05a73b Enable multiline select for blobs.
Holding shift will allow users to click and select multiple lines.
The behavior is similar to GitHub.
Complete with tests.
2013-11-27 20:08:37 -06:00
Sytse Sijbrandij 68726c5bb4 Button name has an upcase in it. 2013-11-27 17:57:55 +01:00
Sytse Sijbrandij d4533a1308 Wiki page url changed due to title cleanup. 2013-11-27 17:26:04 +01:00
Dmitriy Zaporozhets 09d00563af Merge branch 'improve/show_issue_state' of /home/git/repositories/gitlab/gitlabhq 2013-11-27 14:01:36 +00:00
Dmitriy Zaporozhets 81eae5de89 Capybara tests with first-child/last-child randomly fails so replaced with alternative method
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-27 15:00:57 +02:00
Dmitriy Zaporozhets 3f94e14d96 Merge pull request #5701 from gitlabhq/feature/internal_projects
Feature: Internal projects
2013-11-27 04:20:49 -08:00
Dmitriy Zaporozhets 319d2b78b4 Remove unnecessary \" symbols
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-27 13:40:32 +02:00
Dmitriy Zaporozhets 64dff78214 Restyle public access help page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-27 13:26:16 +02:00
Dmitriy Zaporozhets 4091322dba Improve UX of project visiblity level. Improve "Public Access" help page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-27 13:13:33 +02:00
Dmitriy Zaporozhets d4ffcc7cbf Show issue open state as label 2013-11-27 10:22:19 +00:00
Dmitriy Zaporozhets fa7d62494a Merge branch 'authenticated_public_mode' of https://github.com/jhollingsworth/gitlabhq into feature/internal_projects
Conflicts:
	app/models/project.rb

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-27 11:51:46 +02:00
Dmitriy Zaporozhets 9aaf478f10 Merge branch 'improve/preview_button' of /home/git/repositories/gitlab/gitlabhq 2013-11-27 09:31:50 +00:00
Dmitriy Zaporozhets b79d4c9b28 Merge branch 'bug/default_branch_cached' of /home/git/repositories/gitlab/gitlabhq 2013-11-27 09:31:41 +00:00
Dmitriy Zaporozhets 7e9e894d5b Merge branch 'feature/readonly_ldap_email' of /home/git/repositories/gitlab/gitlabhq 2013-11-27 09:31:29 +00:00
Dmitriy Zaporozhets 042ec53c40 Minor UI improvements
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-27 11:29:52 +02:00
Dmitriy Zaporozhets c2f6eb0ffe Rollback preview button href
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-27 11:18:33 +02:00
Dmitriy Zaporozhets b34378c4d7 Improve preview/edit links for comment form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-27 11:14:42 +02:00
Jacob Vosmaer 562a461c56 Disable rake color output unless connected to TTY 2013-11-27 10:09:46 +01:00
Dmitriy Zaporozhets e2e1167022 Fix default branch being cached and show old one after change
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-27 10:49:59 +02:00
Dmitriy Zaporozhets b2e4664cc7 Read-only email field for LDAP user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-27 10:32:37 +02:00