OSDN Git Service
Valeriy Sizov [Fri, 11 May 2012 07:54:51 +0000 (00:54 -0700)]
Merge pull request #807 from robbkidd/update_the_gems
Updated gems. Specs all still pass. (Devise pinned to 1.x)
Valeriy Sizov [Fri, 11 May 2012 07:47:02 +0000 (00:47 -0700)]
Merge pull request #808 from robbkidd/mr_text_column_size_increase_in_schema.rb_too
Add to schema.rb the increased MR text column size.
Robb Kidd [Thu, 10 May 2012 21:54:22 +0000 (21:54 +0000)]
Add to schema.rb the increased MR text column size.
This change was made in a migration in commit
17a88bb6a21cc8b6125bd2e36c1f62f4bd13300e.
Because the schema.rb is checked in, the column size increase should
be here, too.
Robb Kidd [Thu, 10 May 2012 21:46:07 +0000 (21:46 +0000)]
Updated gems. Specs all still pass. (Devise pinned to 1.x)
Pinned devise to the 1.x series for the moment. Going to 2.0 threw
deprecation warnings about:
* Devise.stateless_token= (append :token_auth to Devise.skip_session_storage instead)
* devise.registrations.reasons in yml (use devise.registrations.signed_up_but_REASON)
Valeriy Sizov [Thu, 10 May 2012 09:48:43 +0000 (02:48 -0700)]
Merge pull request #800 from zx1986/patch-1
in /etc/init.d/gitlab, I add "-l" option in sh command
張旭 [Wed, 9 May 2012 09:46:42 +0000 (17:46 +0800)]
in /etc/init.d/gitlab, I add "-l" option in sh command
Valeriy Sizov [Mon, 7 May 2012 10:42:33 +0000 (03:42 -0700)]
Merge pull request #794 from SaitoWu/master
update launchy to fix an NoMethodError on development and test mode
Valeriy Sizov [Mon, 7 May 2012 10:15:09 +0000 (13:15 +0300)]
Update .travis.yml
Saito [Mon, 7 May 2012 02:55:57 +0000 (10:55 +0800)]
update launchy to fix an nomethod error on development and test mode
Valeriy Sizov [Fri, 4 May 2012 09:47:19 +0000 (02:47 -0700)]
Merge pull request #785 from prydonius/spelling_mistake
spelling mistake 'successfull'
Adnan Abdulhussein [Thu, 3 May 2012 19:35:15 +0000 (20:35 +0100)]
spelling mistake 'successfull'
Valeriy Sizov [Thu, 3 May 2012 13:19:49 +0000 (06:19 -0700)]
Merge pull request #775 from netdata/gravatar_empty_issue
When the email address is empty gitlab will give a 500 error
Valeriy Sizov [Thu, 3 May 2012 13:17:37 +0000 (06:17 -0700)]
Merge pull request #777 from netdata/Show_better_permissions_overview
Make permission overview structured
Valeriy Sizov [Thu, 3 May 2012 13:15:59 +0000 (06:15 -0700)]
Merge pull request #778 from netdata/Allow_short_project_names
Allow short project names
Wouter D'Haeseleer [Thu, 3 May 2012 12:19:06 +0000 (14:19 +0200)]
Define a default value as suggested by ariejan
Wouter D'Haeseleer [Thu, 3 May 2012 10:53:24 +0000 (12:53 +0200)]
Allow short project names
We have some projects which a length of 2.
With this I lower the minimum lenght to 1.
As I could not found a specific reason why it is set to 3...
Wouter D'Haeseleer [Thu, 3 May 2012 10:35:46 +0000 (12:35 +0200)]
Make permission overview structured
The current overview is a mess.
This pull commit will make it look more clean.
All permissions are alliged between the columns and the master rights
have been enchanced with all its rights.
Wouter D'Haeseleer [Thu, 3 May 2012 10:20:27 +0000 (12:20 +0200)]
When the email address is empty gitlab will give a 500 error
Since some conversion tools do commits with an empty commiters email
address gitlab will fail with a 500 error
Ariejan de Vroom [Sun, 29 Apr 2012 21:45:01 +0000 (00:45 +0300)]
Try running against 1.9.3 again.
Zevs [Sun, 29 Apr 2012 21:24:59 +0000 (00:24 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Zevs [Sun, 29 Apr 2012 21:23:19 +0000 (00:23 +0300)]
Task#755 auto-merge don`t work correctly.
Valeriy Sizov [Sun, 29 Apr 2012 07:39:15 +0000 (10:39 +0300)]
small fix installation`s guide.
Valery Sizov [Thu, 26 Apr 2012 22:09:23 +0000 (01:09 +0300)]
MR: change path to lock file
Valery Sizov [Thu, 26 Apr 2012 21:55:26 +0000 (00:55 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Valery Sizov [Thu, 26 Apr 2012 21:53:55 +0000 (00:53 +0300)]
Task #735 Automerge should not be checked on every load of MR show page
Dmitriy Zaporozhets [Thu, 26 Apr 2012 17:43:12 +0000 (20:43 +0300)]
Hooks UI improved, Request tests added
Dmitriy Zaporozhets [Thu, 26 Apr 2012 11:05:09 +0000 (04:05 -0700)]
Merge pull request #743 from qqshfox/fix_issue_742
fix #742
Hanfei Shen [Thu, 26 Apr 2012 11:00:29 +0000 (19:00 +0800)]
fix #742
Dmitriy Zaporozhets [Thu, 26 Apr 2012 09:09:07 +0000 (02:09 -0700)]
Merge pull request #741 from mgesmundo/master
Cosmetic change in menu
mgesmundo [Thu, 26 Apr 2012 08:55:46 +0000 (11:55 +0300)]
Cosmetic change in menu
Valeriy Sizov [Tue, 24 Apr 2012 20:59:27 +0000 (13:59 -0700)]
Merge pull request #732 from mmozuras/ldap_name_utf8
Force utf-8 encoding for ldap omniauth_info.name
Dmitriy Zaporozhets [Tue, 24 Apr 2012 18:47:01 +0000 (21:47 +0300)]
Home button should targeted on root page of context
gitlabhq [Tue, 24 Apr 2012 14:52:10 +0000 (17:52 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
gitlabhq [Tue, 24 Apr 2012 18:49:34 +0000 (21:49 +0300)]
New project page improved. User profile improved. Show issues, participant on Milestone show page.
Dmitriy Zaporozhets [Tue, 24 Apr 2012 10:55:03 +0000 (03:55 -0700)]
Merge pull request #704 from tader/workaround-charlock-holmes
Rescue from CharlockHolmes failures.
Thomas A. de Ruiter [Tue, 24 Apr 2012 10:41:20 +0000 (12:41 +0200)]
Rescue from CharlockHolmes failure
mmozuras [Tue, 24 Apr 2012 07:42:30 +0000 (10:42 +0300)]
Force utf-8 encoding for ldap omniauth_info.name
Ariejan de Vroom [Tue, 24 Apr 2012 06:34:00 +0000 (23:34 -0700)]
Merge pull request #726 from kvs/patch-1
Fix very minor spelling issue.
Kenneth Vestergaard [Mon, 23 Apr 2012 14:41:15 +0000 (17:41 +0300)]
Fix very minor spelling issue.
gitlabhq [Mon, 23 Apr 2012 12:32:56 +0000 (15:32 +0300)]
fixed email markdown
Ariejan de Vroom [Mon, 23 Apr 2012 07:54:19 +0000 (10:54 +0300)]
Make sure tmp/merge_repo is available to write lock files for auto-merge.
Dmitriy Zaporozhets [Sun, 22 Apr 2012 13:49:45 +0000 (16:49 +0300)]
corrected exception for automerge
Dmitriy Zaporozhets [Sun, 22 Apr 2012 13:38:39 +0000 (06:38 -0700)]
Merge pull request #713 from gitlabhq/fast_automerge
Fast automerge
Valery Sizov [Sun, 22 Apr 2012 13:14:01 +0000 (16:14 +0300)]
fast automerge: done
Dmitriy Zaporozhets [Sun, 22 Apr 2012 13:01:59 +0000 (16:01 +0300)]
logo changed for header
Valery Sizov [Sun, 22 Apr 2012 12:19:09 +0000 (15:19 +0300)]
fast automerge: base implementation
Dmitriy Zaporozhets [Sat, 21 Apr 2012 10:23:44 +0000 (13:23 +0300)]
Increased automerge timeout. Works for 300 commits MR on repo with 200MB size
Dmitriy Zaporozhets [Sat, 21 Apr 2012 09:45:43 +0000 (12:45 +0300)]
Fixed db_schema & reordered rake tasks
Dmitriy Zaporozhets [Sat, 21 Apr 2012 09:22:56 +0000 (12:22 +0300)]
Merge remote-tracking branch 'origin/merge_button'
Conflicts:
app/assets/javascripts/merge_requests.js
db/schema.rb
Dmitriy Zaporozhets [Sat, 21 Apr 2012 09:15:17 +0000 (12:15 +0300)]
VERSION to 2.4.0
Dmitriy Zaporozhets [Fri, 20 Apr 2012 22:48:03 +0000 (01:48 +0300)]
linguist gitlab fork
Dmitriy Zaporozhets [Fri, 20 Apr 2012 22:44:52 +0000 (01:44 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq into arthurschreiber-use_redcarpet_for_markdown
Dmitriy Zaporozhets [Fri, 20 Apr 2012 22:44:15 +0000 (01:44 +0300)]
Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-use_redcarpet_for_markdown
Conflicts:
Gemfile
Gemfile.lock
Dmitriy Zaporozhets [Fri, 20 Apr 2012 22:27:53 +0000 (15:27 -0700)]
Merge pull request #709 from blueyed/master
Fix typo: "less then" => "less than"
Dmitriy Zaporozhets [Fri, 20 Apr 2012 22:26:22 +0000 (01:26 +0300)]
Project linguist integration
Daniel Hahler [Fri, 20 Apr 2012 21:36:09 +0000 (23:36 +0200)]
Fix typo: "less then" => "less than".
Arthur Schreiber [Fri, 20 Apr 2012 21:21:12 +0000 (23:21 +0200)]
Using github's linguist to better detect filetypes and to do syntax highlighting.
Arthur Schreiber [Tue, 17 Apr 2012 21:02:21 +0000 (23:02 +0200)]
Switch to Redcarpet for Markdown Rendering.
This gives us Github Flavored Markdown, which is awesome.
Dmitriy Zaporozhets [Fri, 20 Apr 2012 19:51:57 +0000 (22:51 +0300)]
fixed admin root path for header
randx [Fri, 20 Apr 2012 16:41:49 +0000 (19:41 +0300)]
Admin dashboard
randx [Fri, 20 Apr 2012 16:11:49 +0000 (19:11 +0300)]
Pagination and better perfomance for projects page.
Dmitriy Zaporozhets [Fri, 20 Apr 2012 07:53:20 +0000 (00:53 -0700)]
Merge pull request #698 from Sindacious/master
Display Milestones without a due date as active
Dmitriy Zaporozhets [Thu, 19 Apr 2012 20:35:35 +0000 (23:35 +0300)]
Use try for commit prev_commit_id detection
Dmitriy Zaporozhets [Thu, 19 Apr 2012 20:06:45 +0000 (23:06 +0300)]
Fix an issue with MR unavailable if remove source branch
James Newton [Thu, 19 Apr 2012 18:24:02 +0000 (13:24 -0500)]
display milestones that are not marked with a due date as active
Dmitriy Zaporozhets [Thu, 19 Apr 2012 11:03:55 +0000 (04:03 -0700)]
Merge pull request #696 from CodeBlock/patch-1
Fix a few grammatical mistakes in profile view.
Ricky Elrod [Thu, 19 Apr 2012 11:01:58 +0000 (08:01 -0300)]
Fix a few grammatical mistakes in profile view.
Dmitriy Zaporozhets [Wed, 18 Apr 2012 06:33:15 +0000 (23:33 -0700)]
Merge pull request #687 from fixe/label-typo
Fixed typo in label
Dmitriy Zaporozhets [Wed, 18 Apr 2012 06:32:53 +0000 (23:32 -0700)]
Merge pull request #686 from fixe/patch-1
Fixed typo
Tiago Ribeiro [Wed, 18 Apr 2012 01:34:14 +0000 (02:34 +0100)]
Fixed typo in label
Tiago Ribeiro [Wed, 18 Apr 2012 00:49:02 +0000 (02:49 +0200)]
Fixed typo
Dmitriy Zaporozhets [Tue, 17 Apr 2012 19:08:07 +0000 (22:08 +0300)]
MR commits suppressed if too many. few icons
Dmitriy Zaporozhets [Tue, 17 Apr 2012 18:03:01 +0000 (21:03 +0300)]
Milestone filter for issues improved
Dmitriy Zaporozhets [Tue, 17 Apr 2012 17:35:27 +0000 (20:35 +0300)]
fixed app crash on new issue via get
Dmitriy Zaporozhets [Tue, 17 Apr 2012 17:27:18 +0000 (20:27 +0300)]
1. Improved admin -> new project form
2. Fixed bug: post-receive file was not added when create project via admin
Dmitriy Zaporozhets [Mon, 16 Apr 2012 21:22:59 +0000 (00:22 +0300)]
Issues form improved, Show milestone for Issue show
Valery Sizov [Mon, 16 Apr 2012 20:49:57 +0000 (23:49 +0300)]
Auto-merge: reise exception when gitlab do not have access to repo
Valery Sizov [Mon, 16 Apr 2012 20:37:04 +0000 (23:37 +0300)]
Auto-merge: implemented lock file
Dmitriy Zaporozhets [Mon, 16 Apr 2012 20:33:03 +0000 (23:33 +0300)]
User blocking improved. Admin area styled
Valery Sizov [Mon, 16 Apr 2012 20:05:08 +0000 (23:05 +0300)]
Auto-merge: 'already can not be merged' alert
Valery Sizov [Mon, 16 Apr 2012 19:08:03 +0000 (22:08 +0300)]
Auto-merge: checking via AJAX
Dmitriy Zaporozhets [Sun, 15 Apr 2012 22:10:09 +0000 (01:10 +0300)]
Commit header improved. finalize PR 667
Dmitriy Zaporozhets [Sun, 15 Apr 2012 18:01:35 +0000 (21:01 +0300)]
Merge branch 'nicer_commit_headers' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-nicer_commit_headers
Arthur Schreiber [Sat, 14 Apr 2012 09:58:43 +0000 (11:58 +0200)]
Change the design a bit to look more like before.
Arthur Schreiber [Fri, 13 Apr 2012 23:25:01 +0000 (01:25 +0200)]
Make parent sha links nicer for merge commits.
Arthur Schreiber [Fri, 13 Apr 2012 22:46:11 +0000 (00:46 +0200)]
Nicer commit headers.
Dmitriy Zaporozhets [Sat, 14 Apr 2012 08:36:53 +0000 (11:36 +0300)]
removed old spec
Dmitriy Zaporozhets [Sat, 14 Apr 2012 08:20:45 +0000 (11:20 +0300)]
Projects page as dashboard. Old dashboard removed
Dmitriy Zaporozhets [Sat, 14 Apr 2012 08:16:11 +0000 (11:16 +0300)]
Search improved
Dmitriy Zaporozhets [Sat, 14 Apr 2012 07:02:04 +0000 (10:02 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Ariejan de Vroom [Fri, 13 Apr 2012 07:28:11 +0000 (09:28 +0200)]
Merged arthurschreiber:patch-1
randx [Fri, 13 Apr 2012 05:12:34 +0000 (08:12 +0300)]
Ability to block user
Arthur Schreiber [Thu, 12 Apr 2012 16:05:19 +0000 (19:05 +0300)]
Add libyaml-dev to the apt-get install string.
If libyaml headers are not installed, YAML will not be correctly compiled (either not at all, or using Syck instead of Psych).
Dmitriy Zaporozhets [Wed, 11 Apr 2012 21:54:07 +0000 (00:54 +0300)]
restored dark theme
Dmitriy Zaporozhets [Wed, 11 Apr 2012 20:59:53 +0000 (23:59 +0300)]
preserve for code browse
Dmitriy Zaporozhets [Wed, 11 Apr 2012 20:50:13 +0000 (23:50 +0300)]
feed few fixes
Dmitriy Zaporozhets [Wed, 11 Apr 2012 20:34:15 +0000 (13:34 -0700)]
Merge pull request #667 from keikubo/master
The indents errors of pre blocks in haml
Dmitriy Zaporozhets [Wed, 11 Apr 2012 20:32:45 +0000 (23:32 +0300)]
bug fixes & bootstrap buttons
Dmitriy Zaporozhets [Wed, 11 Apr 2012 20:03:56 +0000 (23:03 +0300)]
Removed encoding monkey patch
Kei Kubo [Wed, 11 Apr 2012 19:36:52 +0000 (19:36 +0000)]
bug fix: broken indents fixed in markdown rendered statements