OSDN Git Service
Dmitriy Zaporozhets [Tue, 2 Jul 2013 08:47:09 +0000 (11:47 +0300)]
Merge branch 'master' into 6-0-dev
Conflicts:
app/views/dashboard/projects.html.haml
app/views/layouts/_head_panel.html.haml
config/routes.rb
Dmitriy Zaporozhets [Tue, 2 Jul 2013 08:43:40 +0000 (08:43 +0000)]
Merge branch 'warning_relative_url' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 2 Jul 2013 08:42:39 +0000 (11:42 +0300)]
Fix header avatar
Dmitriy Zaporozhets [Tue, 2 Jul 2013 08:41:28 +0000 (01:41 -0700)]
Merge pull request #4440 from jackbot/editable-notes
Editable notes
Jacob Vosmaer [Tue, 2 Jul 2013 08:27:51 +0000 (10:27 +0200)]
Warn that relative URL's are unsupported
Dmitriy Zaporozhets [Mon, 1 Jul 2013 16:01:19 +0000 (19:01 +0300)]
Fix error when reassign issue/merge_request from non-assigned. Fixes #3201
Dmitriy Zaporozhets [Mon, 1 Jul 2013 15:43:35 +0000 (15:43 +0000)]
Merge branch 'feature/shortcuts' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev
Jack Weeden [Tue, 25 Jun 2013 22:46:07 +0000 (23:46 +0100)]
Add editable notes feature
Jack Weeden [Sun, 30 Jun 2013 16:44:59 +0000 (17:44 +0100)]
Changed 'javascript:;' links to '#'
Jack Weeden [Wed, 26 Jun 2013 15:25:24 +0000 (16:25 +0100)]
Removed before_filter as authentication is done within update method
Jack Weeden [Wed, 26 Jun 2013 15:01:59 +0000 (16:01 +0100)]
Authorize user on note update
Jack Weeden [Wed, 26 Jun 2013 14:32:34 +0000 (15:32 +0100)]
Ability to edit comments
Jack Weeden [Wed, 26 Jun 2013 10:27:49 +0000 (10:27 +0000)]
Prevent 'toplevel constant SnippetsController referenced by Project::SnippetsController' warning
Jack Weeden [Tue, 25 Jun 2013 22:46:07 +0000 (23:46 +0100)]
Added update and delete_attachment actions to note controller
Jack Weeden [Mon, 1 Jul 2013 09:43:01 +0000 (10:43 +0100)]
Merge remote-tracking branch 'upstream/master'
Dmitriy Zaporozhets [Sun, 30 Jun 2013 19:10:52 +0000 (22:10 +0300)]
Show shotcut dialog on ?
Dmitriy Zaporozhets [Sun, 30 Jun 2013 16:32:47 +0000 (09:32 -0700)]
Merge pull request #4415 from jackbot/master
Couple of UI additions
Dmitriy Zaporozhets [Sun, 30 Jun 2013 16:32:04 +0000 (09:32 -0700)]
Merge pull request #4442 from 1ed/projects-helper-fix
fixed nav bar for empty repos (fixes #4375)
Dmitriy Zaporozhets [Sun, 30 Jun 2013 16:19:06 +0000 (19:19 +0300)]
Remove capistrano files since its very problematic to deploy gitlab with it
Dmitriy Zaporozhets [Sun, 30 Jun 2013 16:14:27 +0000 (19:14 +0300)]
Update gitlab_git version
Dmitriy Zaporozhets [Sun, 30 Jun 2013 08:35:40 +0000 (11:35 +0300)]
Merge branch 'master' into 6-0-dev
Conflicts:
app/controllers/admin/teams/projects_controller.rb
app/views/team_members/_team_member.html.haml
app/views/teams/members/_member.html.haml
Dmitriy Zaporozhets [Sun, 30 Jun 2013 08:22:21 +0000 (01:22 -0700)]
Merge pull request #4460 from tstone2077/feature_help_markdown
Adding detailed documentation of the markdown syntax.
Dmitriy Zaporozhets [Sun, 30 Jun 2013 08:20:57 +0000 (11:20 +0300)]
Fixed db/schema.rb
Ariejan de Vroom [Sat, 29 Jun 2013 14:31:08 +0000 (17:31 +0300)]
Doc: set permission on config.database.yml
Ariejan de Vroom [Sat, 29 Jun 2013 14:19:15 +0000 (17:19 +0300)]
Merge branch 'bbodenmiller-master'
Closes #4331
Ariejan de Vroom [Sat, 29 Jun 2013 14:19:10 +0000 (17:19 +0300)]
Tweak wording and phrasing
Ariejan de Vroom [Sat, 29 Jun 2013 14:13:47 +0000 (17:13 +0300)]
Merge branch 'master' of git://github.com/bbodenmiller/gitlabhq into bbodenmiller-master
Ariejan de Vroom [Sat, 29 Jun 2013 13:37:51 +0000 (16:37 +0300)]
Merge branch 'muskox-master'
Closes #4424
Scott Pustay [Tue, 25 Jun 2013 18:32:28 +0000 (11:32 -0700)]
fixed typo in assgned
Dmitriy Zaporozhets [Sat, 29 Jun 2013 06:05:26 +0000 (09:05 +0300)]
Classic theme: Dark color for header links. White color for loading spinner
Thurston Stone [Thu, 27 Jun 2013 21:58:43 +0000 (16:58 -0500)]
Adding detailed documentation of the markdown syntax.
This includes standard markdown as well as GitLab extended markdown as well as references to documents used.
Dmitriy Zaporozhets [Sat, 29 Jun 2013 05:35:52 +0000 (08:35 +0300)]
Reduce the size of main nav
Dmitriy Zaporozhets [Sat, 29 Jun 2013 04:55:13 +0000 (21:55 -0700)]
Merge pull request #4323 from axilleas/update_docs
Create uploads dir otherwise backup fails. Fix #4304
Dmitriy Zaporozhets [Fri, 28 Jun 2013 20:33:14 +0000 (23:33 +0300)]
Use triangle for current tab highlight
Dmitriy Zaporozhets [Fri, 28 Jun 2013 20:11:27 +0000 (23:11 +0300)]
better align for main-nav
Gábor Egyed [Sun, 23 Jun 2013 18:39:46 +0000 (20:39 +0200)]
fixed nav bar for empty repos (fixes #4375)
Dmitriy Zaporozhets [Wed, 26 Jun 2013 20:00:15 +0000 (23:00 +0300)]
Fixed showing files, commits tabs for empty project
Dmitriy Zaporozhets [Wed, 26 Jun 2013 18:50:47 +0000 (21:50 +0300)]
Test user page with spinach
Dmitriy Zaporozhets [Wed, 26 Jun 2013 18:34:20 +0000 (21:34 +0300)]
Add scenario for expired password
Dmitriy Zaporozhets [Wed, 26 Jun 2013 17:54:51 +0000 (20:54 +0300)]
Add profile notification spinach
Dmitriy Zaporozhets [Wed, 26 Jun 2013 17:17:07 +0000 (20:17 +0300)]
Fix route specs
Dmitriy Zaporozhets [Wed, 26 Jun 2013 17:10:14 +0000 (10:10 -0700)]
Merge pull request #4239 from karlhungus/feature-alt-text-for-gravatars
Gravatar image fixes when gravatar unavailable
Dmitriy Zaporozhets [Wed, 26 Jun 2013 16:25:07 +0000 (19:25 +0300)]
Add more autocomplete options to project search
Dmitriy Zaporozhets [Wed, 26 Jun 2013 16:13:29 +0000 (19:13 +0300)]
Fix spinach test
Dmitriy Zaporozhets [Wed, 26 Jun 2013 15:35:32 +0000 (18:35 +0300)]
Store satellites lock files inside satellites dir
Dmitriy Zaporozhets [Wed, 26 Jun 2013 15:15:50 +0000 (18:15 +0300)]
more entries in changelog
Izaak Alpert [Wed, 26 Jun 2013 14:00:21 +0000 (10:00 -0400)]
Rebasing on master
Change-Id: Iad49f225f23675b843457df5d6965c7cd50e99a3
Dmitriy Zaporozhets [Wed, 26 Jun 2013 13:58:56 +0000 (16:58 +0300)]
Add keyboard nav for tree view. Refactor tree-view coffee
Dmitriy Zaporozhets [Wed, 26 Jun 2013 12:57:02 +0000 (15:57 +0300)]
Prevent confusion in naming user variable at admin area
Izaak Alpert [Thu, 6 Jun 2013 16:02:58 +0000 (12:02 -0400)]
Gravatar image fixes when gravatar unavailable
-Alt text to image was set to hash, which would make the page display hashes if the image/gravatar wasn't available, set the alt text to '', and made the main tool bar image follow the same or similar constraints as the other images (.avatar, .s26)
Conflicts:
app/assets/stylesheets/themes/ui_bb.scss
app/views/snippets/_snippet.html.haml
Change-Id: I42e1e86f535486fd2556d4b3e4591f3676eea033
Dmitriy Zaporozhets [Wed, 26 Jun 2013 12:32:09 +0000 (15:32 +0300)]
group add_users spec
Dmitriy Zaporozhets [Wed, 26 Jun 2013 12:09:17 +0000 (15:09 +0300)]
Test admin:group#index
Dmitriy Zaporozhets [Wed, 26 Jun 2013 12:02:28 +0000 (15:02 +0300)]
Remove unnecessary namespaced resource
Dmitriy Zaporozhets [Wed, 26 Jun 2013 11:51:57 +0000 (14:51 +0300)]
Improve change group ownership logic
Dmitriy Zaporozhets [Wed, 26 Jun 2013 11:41:03 +0000 (14:41 +0300)]
Apply user project limit only for personal projects. We should not include group projects for user limit
Dmitriy Zaporozhets [Wed, 26 Jun 2013 06:24:38 +0000 (23:24 -0700)]
Merge pull request #4393 from dosire/scrum-improvements
Rename unspecified to make it clearer and in line with scrum terminology
Dmitriy Zaporozhets [Wed, 26 Jun 2013 05:57:33 +0000 (22:57 -0700)]
Merge pull request #4412 from senny/fix_bad_constant_reference
fix bad constant reference in `project_routing_spec.rb`.
Yves Senn [Wed, 26 Jun 2013 05:55:13 +0000 (22:55 -0700)]
Merge pull request #4419 from jlgeering/master
whitespaces in gitlab.yml.example
Dmitriy Zaporozhets [Wed, 26 Jun 2013 05:12:29 +0000 (22:12 -0700)]
Merge pull request #4361 from kenips/master
Add missing assigned_to renaming to merge_requests_load_context
Dmitriy Zaporozhets [Tue, 25 Jun 2013 14:34:50 +0000 (17:34 +0300)]
Limit amount of contributors at graph to 100 persons
Dmitriy Zaporozhets [Tue, 25 Jun 2013 14:05:39 +0000 (17:05 +0300)]
Update repository head when change default project branch
Dmitriy Zaporozhets [Tue, 25 Jun 2013 13:49:27 +0000 (16:49 +0300)]
Changelog updated. Added migrate docs for 6.0
Dmitriy Zaporozhets [Tue, 25 Jun 2013 11:19:33 +0000 (14:19 +0300)]
Fixed cache key difference for graph
Dmitriy Zaporozhets [Tue, 25 Jun 2013 11:12:38 +0000 (14:12 +0300)]
Fix key observer spec
Jean-Luc Geering [Tue, 25 Jun 2013 11:01:41 +0000 (14:01 +0300)]
whitespaces in gitlab.yml.example
Dmitriy Zaporozhets [Tue, 25 Jun 2013 10:55:03 +0000 (13:55 +0300)]
Cache graph log
Dmitriy Zaporozhets [Tue, 25 Jun 2013 10:41:49 +0000 (13:41 +0300)]
remove text decoration for nav
Dmitriy Zaporozhets [Tue, 25 Jun 2013 10:16:08 +0000 (13:16 +0300)]
Make nav menu a bit higher
Dmitriy Zaporozhets [Tue, 25 Jun 2013 10:15:07 +0000 (13:15 +0300)]
Make group settings menu looks similar to project settings menu
Dmitriy Zaporozhets [Tue, 25 Jun 2013 09:39:58 +0000 (12:39 +0300)]
Use graph ticks to make axis more readable
vagrant [Tue, 25 Jun 2013 09:05:02 +0000 (09:05 +0000)]
Merge remote-tracking branch 'upstream/master'
Dmitriy Zaporozhets [Tue, 25 Jun 2013 09:02:10 +0000 (12:02 +0300)]
Fix key observer
Jack Weeden [Tue, 25 Jun 2013 08:49:09 +0000 (09:49 +0100)]
Don't show 'Filter by labels' text if there are no labels
Don't show project search form if there are no projects
Dmitriy Zaporozhets [Tue, 25 Jun 2013 06:18:07 +0000 (06:18 +0000)]
Merge branch 'contributing-pull-requests' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 25 Jun 2013 06:17:54 +0000 (06:17 +0000)]
Merge branch 'gem-update-policy' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 25 Jun 2013 06:17:14 +0000 (06:17 +0000)]
Merge branch 'animated-gif' of /home/git/repositories/gitlab/gitlabhq
Jack Weeden [Mon, 24 Jun 2013 22:57:26 +0000 (23:57 +0100)]
Added tooltip to snippet public/private icons
Jack Weeden [Mon, 24 Jun 2013 22:55:37 +0000 (23:55 +0100)]
Added delete button to snippet view
Dmitriy Zaporozhets [Mon, 24 Jun 2013 19:13:00 +0000 (22:13 +0300)]
Merge branch 'master' into 6-0-dev
Conflicts:
app/views/projects/issues/show.html.haml
db/fixtures/development/09_issues.rb
db/fixtures/development/10_merge_requests.rb
Dmitriy Zaporozhets [Mon, 24 Jun 2013 19:03:32 +0000 (22:03 +0300)]
update gems. remove console.log
Dmitriy Zaporozhets [Mon, 24 Jun 2013 18:00:33 +0000 (21:00 +0300)]
Fix ssh key test
Dmitriy Zaporozhets [Mon, 24 Jun 2013 17:47:59 +0000 (20:47 +0300)]
Fix ssh key test
Dmitriy Zaporozhets [Mon, 24 Jun 2013 17:07:21 +0000 (20:07 +0300)]
store and display public key fingerprint
Yves Senn [Mon, 24 Jun 2013 16:57:49 +0000 (18:57 +0200)]
fix bad constant reference in `project_routing_spec.rb`.
Sytse Sijbrandij [Mon, 24 Jun 2013 16:54:08 +0000 (18:54 +0200)]
Detail gem update policy.
Dmitriy Zaporozhets [Mon, 24 Jun 2013 16:25:10 +0000 (19:25 +0300)]
Better design for SSH keys page
Dmitriy Zaporozhets [Mon, 24 Jun 2013 16:24:27 +0000 (19:24 +0300)]
Fix profile emails with new key route
Dmitriy Zaporozhets [Mon, 24 Jun 2013 15:43:53 +0000 (08:43 -0700)]
Merge pull request #4410 from senny/dont_console_log_in_code
we should not use `console.log` in production code...
Yves Senn [Mon, 24 Jun 2013 15:40:23 +0000 (17:40 +0200)]
we should not use `console.log` in production code...
Dmitriy Zaporozhets [Mon, 24 Jun 2013 15:26:57 +0000 (18:26 +0300)]
Fix new ssh key link from shared partial
Dmitriy Zaporozhets [Mon, 24 Jun 2013 15:24:14 +0000 (18:24 +0300)]
Move Profile related controllers under Profiles:: module
Dmitriy Zaporozhets [Mon, 24 Jun 2013 15:20:58 +0000 (08:20 -0700)]
Merge pull request #3898 from jacargentina/notifymentioned
Notify email to mentioned users; show participants ala github on issuables
Javier Castro [Thu, 9 May 2013 23:37:47 +0000 (20:37 -0300)]
Show participants on issues, including mentions, and notify email to all participants
Dmitriy Zaporozhets [Mon, 24 Jun 2013 13:56:07 +0000 (06:56 -0700)]
Merge pull request #4407 from jackbot/master
Database seeding failing
Jack Weeden [Mon, 24 Jun 2013 13:53:40 +0000 (14:53 +0100)]
Merge branch 'master' of github.com:jackbot/gitlabhq
Jack Weeden [Mon, 24 Jun 2013 13:21:46 +0000 (14:21 +0100)]
cattr_accessor removed from IssueObserver and MergeRequestObserver but not updated in fixtures
Sytse Sijbrandij [Mon, 24 Jun 2013 07:20:08 +0000 (09:20 +0200)]
Notes about what PR's we would like to see.
Yves Senn [Mon, 24 Jun 2013 07:12:12 +0000 (00:12 -0700)]
Merge pull request #4369 from zeehio/patch-1
[Doc] Update 5.0 to 5.1: Recompile assets
Sytse Sijbrandij [Sun, 23 Jun 2013 19:54:24 +0000 (21:54 +0200)]
Add animated screenshots.
Dmitriy Zaporozhets [Sun, 23 Jun 2013 18:56:05 +0000 (18:56 +0000)]
Merge branch 'refactor/projects_controllers' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev
OSDN Git Service
