Commit Graph
7232 Commits
Author SHA1 Message Date
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
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
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
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
Dmitriy Zaporozhets 44c55307a0 Use 1.9 hash syntax for some tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-27 10:04:00 +02:00
Dmitriy Zaporozhets 526c2fdf48 gitlab-grack up to 1.1.0
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-27 09:49:21 +02:00
Jason Hollingsworth d9bb4230cc Adding authenticated public mode (internal).
Added visibility_level icons to project view (rather than just text).
Added public projects to search results.
Added ability to restrict visibility levels standard users can set.
2013-11-26 22:22:07 -06:00
Dmitriy Zaporozhets 51b5509bac Merge branch '6_3_update' of /home/git/repositories/gitlab/gitlabhq 2013-11-26 18:34:18 +00:00
Dmitriy Zaporozhets 8c7d342a28 Mention parallel diff feature in CHANGELOG for 6.4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-26 13:34:20 +02:00
Dmitriy Zaporozhets 949c6c1b0a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-11-26 13:32:11 +02:00
Dmitriy Zaporozhets b51c2c8118 Merge pull request #5308 from Popl7/parallel-diffs-side-by-side
diff view on commit with parallel diff view
2013-11-26 03:31:42 -08:00
Dmitriy Zaporozhets 58f69f0f4a Merge branch 'show_ruby_version' of /home/git/repositories/gitlab/gitlabhq 2013-11-26 11:28:21 +00:00
Jacob Vosmaer cbbf715d30 Show ruby version on admin dashboard 2013-11-26 11:14:25 +01:00
Jacob Vosmaer c275169a1b Explain and streamline upgrade steps 2013-11-26 10:31:02 +01:00
Jacob Vosmaer 6f17221b7a Fix whitespace 2013-11-26 10:30:56 +01:00
Jacob Vosmaer fecbf9255c No need to re-download the init script 2013-11-26 10:22:23 +01:00
Jacob Vosmaer 705c495ede Remove outdated steps from 6.2-to-6.3.md 2013-11-26 10:22:04 +01:00
Dmitriy Zaporozhets c57180367c Fix overflow on project home page for long names
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-26 10:08:46 +02:00
Dmitriy Zaporozhets 02d8c00323 Fix session spec because of password length
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 22:33:04 +02:00
Dmitriy Zaporozhets 8e117f0e37 Reduce strong html tag usage for dashboard events
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 22:21:11 +02:00
Dmitriy Zaporozhets a5f7f5d8b4 Extend CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 22:13:13 +02:00
Dmitriy Zaporozhets 666861f8ff More compact issues page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 22:10:18 +02:00
Dmitriy Zaporozhets ec630ffc3b More fixes to test because of long password
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 21:36:17 +02:00
Dmitriy Zaporozhets 46c50caa6e Show broadcast messages on group, profile and project settings pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 21:23:05 +02:00
Dmitriy Zaporozhets 8de013ea2d Bump gitlab-grit gem. Fixes another 500 error with submodules
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 21:12:46 +02:00
Dmitriy Zaporozhets 58601ebdab Fix tests after user password length was changed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 20:07:55 +02:00
Dmitriy Zaporozhets 7ed15bbc0d Minor ui fixes for selects at issues page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 18:58:00 +02:00
Dmitriy Zaporozhets 11aa7b0025 Added ability to clear milestone/assignee during bulk update
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 18:57:44 +02:00
Dmitriy Zaporozhets 75f0ff2ce1 Update chosen-rails
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 18:57:08 +02:00
Dmitriy Zaporozhets 47e8c67d1d Include API session route under rack protection
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 18:24:45 +02:00
Dmitriy Zaporozhets 0461760f21 Minimal password length increased
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 18:11:03 +02:00
Dmitriy Zaporozhets 8b9bbeeba2 Prevent 500 if data[:commits] is nil for event
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 17:59:12 +02:00
Dmitriy Zaporozhets 4cb17deec1 Fix empty sort label on issues page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 17:46:16 +02:00