Commit Graph
7285 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 16916fb103 Improve UI for stacked nav-pills
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.4.0.pre2
2013-12-03 12:19:48 +02:00
Dmitriy Zaporozhets d793bceb90 Merge pull request #5733 from bke-drewb/issue-5716
Issue 5716 - Allow removal of avatar
2013-12-02 23:52:04 -08:00
Jacob Vosmaer aa69e29e70 Merge pull request #5610 from demosdemon/patch-1
Add client_max_body_size to nginx site
2013-12-02 23:29:11 -08:00
Drew Blessing b08608b261 Issue 5716 - Allow removal of avatar
Add class and style

Add spinach tests

Add entry to CHANGELOG

Add entry to CHANGELOG
2013-12-02 16:20:34 -06:00
Dmitriy Zaporozhets e411f3bab2 Small UI fixes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 17:24:03 +02:00
Dmitriy Zaporozhets 3a2c32c054 Fix broken pagination for issues
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 15:22:38 +02:00
Dmitriy Zaporozhets 7ecd1249d5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-02 15:08:43 +02:00
Dmitriy Zaporozhets bd0a32fb89 Merge pull request #5732 from Tandrial/patch-1
Missing gem bundler
2013-12-02 04:38:56 -08:00
Dmitriy Zaporozhets bc663a7383 remove GET window.updatePage method that do dataType script
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 14:33:27 +02:00
Dmitriy Zaporozhets 4f32d2e28e Remove GET .js format for Milestone controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 14:32:54 +02:00
Dmitriy Zaporozhets e3464a54d8 Remove .js format for MergeRequest controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 14:27:36 +02:00
Dmitriy Zaporozhets 4e878ad902 Disable travis notifications
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 10:39:46 +02:00
Dmitriy Zaporozhets 31892227d7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq v6.4.0.pre1 2013-12-02 09:46:37 +02:00
Dmitriy Zaporozhets df9caf0b94 Merge branch 'add-cookbook' of /home/git/repositories/gitlab/gitlabhq 2013-12-02 07:46:26 +00:00
Dmitriy Zaporozhets 98c5912aaa Merge branch 'make-gender-neutral' of /home/git/repositories/gitlab/gitlabhq 2013-12-02 07:45:50 +00:00
Dmitriy Zaporozhets 90f9c3fbc7 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-02 09:34:26 +02:00
Dmitriy Zaporozhets 5fd90cd5e4 Merge pull request #5724 from Popl7/add_thumbsup_thumbsdown_emoji_voting
Thumbsup and thumbsdown emoji should be counted when voting
2013-12-01 23:33:48 -08:00
Dmitriy Zaporozhets dc29b23733 Merge pull request #5725 from Popl7/http_repo_link_on_public_acces
Correct url to pull puplic repos anonymously on project page
2013-12-01 23:33:21 -08:00
Dmitriy Zaporozhets 0da6394c41 Merge pull request #5731 from bke-drewb/helpui
Improve Help navigation UI
2013-12-01 23:30:38 -08:00
Sytse Sijbrandij 7f3ff69e3e Merge pull request #5737 from Popl7/type_fix_for_project_network_graph
type_fix_for_project_network_graph
2013-12-01 03:10:16 -08:00
Sytse Sijbrandij 71e92681f2 We welcome everyone to contribute. 2013-12-01 11:53:00 +01:00
Steven Thonus e3d4eb2140 type_fix_for_project_network_graph 2013-11-30 17:27:02 +01:00
Sytse Sijbrandij 6095a1cb25 Comprehensive list of installation methods. 2013-11-30 12:39:11 +01:00
Dmitriy Zaporozhets 931e6a721f Merge branch 'relative-url-needs-warning' of /home/git/repositories/gitlab/gitlabhq 2013-11-30 08:07:36 +00:00
Dmitriy Zaporozhets 3135951640 Merge branch 'database_doc' of /home/git/repositories/gitlab/gitlabhq 2013-11-30 08:06:51 +00:00
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
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