summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve UI for stacked nav-pillsv6.4.0.pre2Dmitriy Zaporozhets2013-12-031-6/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #5733 from bke-drewb/issue-5716Dmitriy Zaporozhets2013-12-028-4/+66
|\ | | | | Issue 5716 - Allow removal of avatar
| * Issue 5716 - Allow removal of avatarDrew Blessing2013-12-028-4/+66
| | | | | | | | | | | | | | | | | | | | Add class and style Add spinach tests Add entry to CHANGELOG Add entry to CHANGELOG
* | Merge pull request #5610 from demosdemon/patch-1Jacob Vosmaer2013-12-021-0/+3
|\ \ | |/ |/| Add client_max_body_size to nginx site
| * Add client_max_body_size to nginx siteJoachim Brandon LeBlanc2013-11-151-0/+3
| | | | | | Added the client_max_body_size declaration to the nginx server block to prevent 413 errors when http post body is larger than the default (1m).
* | Small UI fixesDmitriy Zaporozhets2013-12-022-3/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix broken pagination for issuesDmitriy Zaporozhets2013-12-021-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-12-021-0/+1
|\ \
| * \ Merge pull request #5732 from Tandrial/patch-1Dmitriy Zaporozhets2013-12-021-0/+1
| |\ \ | | | | | | | | Missing gem bundler
| | * | Update ruby.mdTandrial2013-11-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | remove GET window.updatePage method that do dataType scriptDmitriy Zaporozhets2013-12-021-3/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Remove GET .js format for Milestone controllerDmitriy Zaporozhets2013-12-021-5/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Remove .js format for MergeRequest controllerDmitriy Zaporozhets2013-12-025-16/+11
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Disable travis notificationsDmitriy Zaporozhets2013-12-021-0/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqv6.4.0.pre1Dmitriy Zaporozhets2013-12-026-36/+27
|\ \ \
| * \ \ Merge branch 'add-cookbook' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-12-021-16/+7
| |\ \ \
| | * | | Comprehensive list of installation methods.Sytse Sijbrandij2013-11-301-16/+7
| | | | |
| * | | | Merge branch 'make-gender-neutral' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-12-025-20/+20
| |\ \ \ \
| | * | | | We welcome everyone to contribute.Sytse Sijbrandij2013-12-015-20/+20
| |/ / / /
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-12-028-42/+49
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge pull request #5724 from Popl7/add_thumbsup_thumbsdown_emoji_votingDmitriy Zaporozhets2013-12-012-2/+14
| |\ \ \ \ | | | | | | | | | | | | Thumbsup and thumbsdown emoji should be counted when voting
| | * | | | added thumbsup and thumsdown emoji voting with rspec testsvagrant2013-11-282-2/+14
| | |/ / /
| * | | | Merge pull request #5725 from Popl7/http_repo_link_on_public_accesDmitriy Zaporozhets2013-12-013-3/+24
| |\ \ \ \ | | | | | | | | | | | | Correct url to pull puplic repos anonymously on project page
| | * | | | showing as default http link for public repo when anonymousSteven Thonus2013-11-293-3/+24
| | |/ / /
| * | | | Merge pull request #5731 from bke-drewb/helpuiDmitriy Zaporozhets2013-12-011-32/+6
| |\ \ \ \ | | | | | | | | | | | | Improve Help navigation UI
| | * | | | Improve Help navigation UIDrew Blessing2013-11-291-32/+6
| | | |/ / | | |/| | | | | | | | | | | | Make hash keys symbols
| * | | | Merge pull request #5737 from Popl7/type_fix_for_project_network_graphSytse Sijbrandij2013-12-012-5/+5
| |\ \ \ \ | | |/ / / | |/| | | type_fix_for_project_network_graph
| | * | | type_fix_for_project_network_graphSteven Thonus2013-11-302-5/+5
| | |/ /
* | | | Merge branch 'relative-url-needs-warning' of ↵Dmitriy Zaporozhets2013-11-303-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq
| * | | | Add warning back.Sytse Sijbrandij2013-11-293-3/+3
| | |/ / | |/| |
* | | | Merge branch 'database_doc' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-11-302-4/+4
|\ \ \ \
| * | | | Change the mysql user to git from gitlab.Marin Jankovski2013-11-292-4/+4
| | |/ / | |/| |
* | | | Merge branch 'line-for-side-by-side-diff' of ↵Dmitriy Zaporozhets2013-11-301-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | /home/git/repositories/gitlab/gitlabhq
| * | | Side-by-side in changelog.Sytse Sijbrandij2013-11-291-0/+1
| |/ /
* | | Merge branch 'drop_rjs_2' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-11-299-27/+43
|\ \ \
| * | | Drop rjs from Issues#indexDmitriy Zaporozhets2013-11-296-25/+29
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Drop rjs from Notes#indexDmitriy Zaporozhets2013-11-294-9/+21
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'feature/repo_size_in_admin' of ↵Dmitriy Zaporozhets2013-11-293-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq
| * | | | Show bare repository size in admin area(projects page)Dmitriy Zaporozhets2013-11-293-2/+6
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'feature/readme_link' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-11-292-0/+13
|\ \ \ \ | |/ / / |/| | |
| * | | README link from project home pageDmitriy Zaporozhets2013-11-292-0/+13
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix app theme being ignored for public projectsDmitriy Zaporozhets2013-11-293-2/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #5708 from jhollingsworth/feature/multiline-blob-selectDmitriy Zaporozhets2013-11-293-9/+205
|\ \ \ | | | | | | | | Enable multiline select for blobs.
| * | | Enable multiline select for blobs.Jason Hollingsworth2013-11-273-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_faviconDmitriy Zaporozhets2013-11-292-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 glyphHilton Bristow2013-11-292-0/+0
|/ / /
* | | Merge remote-tracking branch 'origin/side-by-side'Dmitriy Zaporozhets2013-11-286-15/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CHANGELOG Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Button name has an upcase in it.Sytse Sijbrandij2013-11-271-1/+1
| | | |
| * | | Conventional naming for diff modes.Sytse Sijbrandij2013-11-276-15/+15
| | | |
* | | | Merge branch 'wiki-reference' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-11-281-1/+1
|\ \ \ \
View Lorry Controller Status