OSDN Git Service
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 [Sat, 31 Mar 2012 10:48:30 +0000 (13:48 +0300)]
fixed mr unmergable method
Dmitriy Zaporozhets [Fri, 30 Mar 2012 17:49:34 +0000 (20:49 +0300)]
Merge Button v1 complete
randx [Fri, 30 Mar 2012 05:25:04 +0000 (08:25 +0300)]
Rake task to provider full repo access for gitolite-owner.\n Automerge requires gitlab user be able to push to any repo
randx [Fri, 30 Mar 2012 05:15:04 +0000 (08:15 +0300)]
Unverify MR on every push. Ajax for MR accept. better UI
randx [Fri, 30 Mar 2012 05:05:04 +0000 (08:05 +0300)]
Better merge handling. show if MR can be accepted or not
Dmitriy Zaporozhets [Thu, 29 Mar 2012 21:27:42 +0000 (00:27 +0300)]
Link for auto merge, db field for MR
randx [Thu, 29 Mar 2012 15:03:05 +0000 (18:03 +0300)]
Raw gitlab automerge feature
Dmitriy Zaporozhets [Wed, 28 Mar 2012 19:53:45 +0000 (22:53 +0300)]
Event & Wiki models specs
Dmitriy Zaporozhets [Wed, 28 Mar 2012 16:31:09 +0000 (19:31 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
randx [Wed, 28 Mar 2012 07:46:51 +0000 (10:46 +0300)]
UI improved, .main_box css class for show pages
randx [Wed, 28 Mar 2012 07:44:51 +0000 (10:44 +0300)]
Project model refactored. Modularity gem
Ariejan de Vroom [Wed, 28 Mar 2012 07:07:24 +0000 (10:07 +0300)]
Added info on MySQL; Fixed formatting and language.
Dmitriy Zaporozhets [Tue, 27 Mar 2012 21:31:22 +0000 (00:31 +0300)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Tue, 27 Mar 2012 21:31:14 +0000 (00:31 +0300)]
Issues, Merge Request show page polished. Fixed +n overflow
Valery Sizov [Tue, 27 Mar 2012 20:15:09 +0000 (23:15 +0300)]
installation guide: change link to script of auto-install
Valeriy Sizov [Tue, 27 Mar 2012 20:13:07 +0000 (13:13 -0700)]
Merge pull request #585 from patthoyts/pt/omniauth-config
Move OmniAuth configuration details into a non-revision controlled file.
Valery Sizov [Tue, 27 Mar 2012 20:11:14 +0000 (23:11 +0300)]
added script for auto install
Valeriy Sizov [Tue, 27 Mar 2012 20:09:06 +0000 (13:09 -0700)]
Merge pull request #586 from patthoyts/pt/ldap-auth-fix
Ensure LDAP provided email is always compared case-insensitively.
Valery Sizov [Tue, 27 Mar 2012 20:04:45 +0000 (23:04 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Valery Sizov [Tue, 27 Mar 2012 20:04:21 +0000 (23:04 +0300)]
fixed yellow background in markdown documents
Ariejan de Vroom [Tue, 27 Mar 2012 13:59:25 +0000 (16:59 +0300)]
Only load MySQL2Adapter connection fix is MySQL2 is available.
Useful for Sqlite or Postgres installations.
Ariejan de Vroom [Tue, 27 Mar 2012 13:46:27 +0000 (06:46 -0700)]
Merge pull request #603 from yvmarques/patch-1
Changed for mysql2 adapter
Yvan [Tue, 27 Mar 2012 13:42:23 +0000 (16:42 +0300)]
Changed for mysql2 adapter
Ariejan de Vroom [Tue, 27 Mar 2012 13:17:23 +0000 (15:17 +0200)]
Added fix for "MySQL has gone away" errors with Resque workers.
Dmitriy Zaporozhets [Mon, 26 Mar 2012 20:11:15 +0000 (23:11 +0300)]
Project show page polished
Dmitriy Zaporozhets [Mon, 26 Mar 2012 19:41:56 +0000 (22:41 +0300)]
Better commit show page
Dmitriy Zaporozhets [Mon, 26 Mar 2012 18:41:58 +0000 (21:41 +0300)]
Js refactoring and ajax animation replaced
Dmitriy Zaporozhets [Mon, 26 Mar 2012 17:30:06 +0000 (20:30 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Mon, 26 Mar 2012 09:25:40 +0000 (02:25 -0700)]
Merge pull request #595 from goshakkk/texting-fixes
Texting issues fix
Gosha Arinich [Mon, 26 Mar 2012 09:11:02 +0000 (12:11 +0300)]
there should be no space after '(' and before ')'
randx [Mon, 26 Mar 2012 04:40:51 +0000 (07:40 +0300)]
fix image width for markdown
Dmitriy Zaporozhets [Sun, 25 Mar 2012 16:44:29 +0000 (19:44 +0300)]
Fixed specs. Some css fixes
Dmitriy Zaporozhets [Sun, 25 Mar 2012 16:05:24 +0000 (19:05 +0300)]
Preparing 591 for merge. Restyled issues & merge requests. Fixed issue edit.
Dmitriy Zaporozhets [Sun, 25 Mar 2012 14:04:07 +0000 (17:04 +0300)]
Merge branch 'master' of https://github.com/dubcanada/gitlabhq into dubcanada-master
Dmitriy Zaporozhets [Sun, 25 Mar 2012 09:02:16 +0000 (02:02 -0700)]
Merge pull request #592 from paularmstrong/bug/install-doc
Fix installation instructions for running gitlab_status
Paul Armstrong [Sat, 24 Mar 2012 23:07:21 +0000 (16:07 -0700)]
Fix instructions for running gitlab_status
When running `rake gitlab_status` to check if it's safe to continue on installation in step 4, you need to use `RAILS_ENV=production` or else you will receive an error about "permission denied for user root@localhost..."
Steven Verbeek [Sat, 24 Mar 2012 21:31:01 +0000 (18:31 -0300)]
Forgot others for border radius
Steven Verbeek [Sat, 24 Mar 2012 21:19:26 +0000 (18:19 -0300)]
Changed Note to Comment
Steven Verbeek [Sat, 24 Mar 2012 17:42:45 +0000 (14:42 -0300)]
Fixed icon, added helper
Steven Verbeek [Sat, 24 Mar 2012 17:38:10 +0000 (14:38 -0300)]
Removed thumbs.db
Steven Verbeek [Sat, 24 Mar 2012 17:36:14 +0000 (14:36 -0300)]
Fixed line ending issues on windows.
Steven Verbeek [Sat, 24 Mar 2012 17:01:38 +0000 (14:01 -0300)]
Fixed line ending issues on windows.
Steven Verbeek [Sat, 24 Mar 2012 16:57:01 +0000 (13:57 -0300)]
Started note attachment changes, and text changes
Steven Verbeek [Sat, 24 Mar 2012 16:53:16 +0000 (13:53 -0300)]
Started note attachment changes, and text changes
Steven Verbeek [Sat, 24 Mar 2012 16:40:21 +0000 (13:40 -0300)]
Started note attachment changes, and text changes
Steven Verbeek [Sat, 24 Mar 2012 16:30:04 +0000 (13:30 -0300)]
Started note attachment changes, and text changes
Steven Verbeek [Sat, 24 Mar 2012 16:26:25 +0000 (13:26 -0300)]
Started note attachment changes, and text changes
Steven Verbeek [Sat, 24 Mar 2012 16:19:20 +0000 (13:19 -0300)]
Started note attachment changes, and text changes
Steven Verbeek [Sat, 24 Mar 2012 16:08:42 +0000 (13:08 -0300)]
Started note attachment changes, and text changes
Ariejan de Vroom [Sat, 24 Mar 2012 09:44:03 +0000 (02:44 -0700)]
Merge pull request #588 from tvlooy/patch-2
See https://github.com/gitlabhq/gitlabhq/issues/572
Tom Van Looy [Sat, 24 Mar 2012 07:38:32 +0000 (08:38 +0100)]
See https://github.com/gitlabhq/gitlabhq/issues/572
Steven Verbeek [Sat, 24 Mar 2012 03:36:54 +0000 (00:36 -0300)]
merging upstream changes
Dmitriy Zaporozhets [Fri, 23 Mar 2012 23:01:36 +0000 (01:01 +0200)]
Improved profile & team member show
Dmitriy Zaporozhets [Fri, 23 Mar 2012 21:01:14 +0000 (23:01 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Conflicts:
resque.sh
Dmitriy Zaporozhets [Fri, 23 Mar 2012 21:00:05 +0000 (23:00 +0200)]
Improved resque.sh
Pat Thoyts [Wed, 7 Mar 2012 11:16:52 +0000 (11:16 +0000)]
Move OmniAuth configuration details into a non-revision controlled file.
Provide an omniauth.rb.sample file to avoid encouraging end-users to commit
their provider access details (passwords or api tokens) into their git
repositories.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Pat Thoyts [Fri, 24 Feb 2012 14:35:44 +0000 (14:35 +0000)]
Ensure LDAP provided email is always compared case-insensitively.
LDAP databases may store email addresses in mixed case so
ensure we only work with a lower case version to avoid missing
a valid account after LDAP login.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Ariejan de Vroom [Fri, 23 Mar 2012 10:20:49 +0000 (03:20 -0700)]
Merge pull request #582 from arenard/patch-1
Use of -p option of mkdir command to avoid message telling tmp/pids directory already exists...
arenard [Fri, 23 Mar 2012 10:18:18 +0000 (11:18 +0100)]
Use of -p option of mkdir command to avoid message telling tmp/pids directory already exists at every GitLab (re)start. It ensures that all directories on the path exists so it can create tmp directory if its not there for some reason.
Ariejan de Vroom [Fri, 23 Mar 2012 08:00:52 +0000 (01:00 -0700)]
Merge pull request #576 from sxua/master
Need to replace If statement with try_files in nginx.conf
Dmitriy Zaporozhets [Thu, 22 Mar 2012 20:57:04 +0000 (22:57 +0200)]
better MR list, dashboard pollished
Dmitriy Zaporozhets [Thu, 22 Mar 2012 20:28:02 +0000 (22:28 +0200)]
Remove button for empty repo. Last push on dashboard. Better notes count indicator for issues
Dmitriy Zaporozhets [Thu, 22 Mar 2012 18:09:47 +0000 (20:09 +0200)]
Fix issues search
Dmitriy Zaporozhets [Thu, 22 Mar 2012 18:02:38 +0000 (20:02 +0200)]
Fix form label for ssl requests
Olexandr Skrypnyk [Thu, 22 Mar 2012 13:34:16 +0000 (15:34 +0200)]
replace if statement with try_files in nginx.conf
http://wiki.nginx.org/IfIsEvil
randx [Wed, 21 Mar 2012 22:09:57 +0000 (00:09 +0200)]
Pagination for Merge Requests. Fixed for issues
randx [Wed, 21 Mar 2012 22:09:56 +0000 (00:09 +0200)]
Issues pagination
randx [Wed, 21 Mar 2012 22:09:55 +0000 (00:09 +0200)]
Fix db seeds for dev
randx [Wed, 21 Mar 2012 22:09:54 +0000 (00:09 +0200)]
CHANGELOG, VERSION updated to 2.3
Valery Sizov [Wed, 21 Mar 2012 22:09:53 +0000 (00:09 +0200)]
design improve of form of key
Valery Sizov [Wed, 21 Mar 2012 22:00:13 +0000 (00:00 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Valery Sizov [Wed, 21 Mar 2012 21:59:12 +0000 (23:59 +0200)]
improve how to merge tips
Ariejan de Vroom [Wed, 21 Mar 2012 13:01:33 +0000 (06:01 -0700)]
Merge pull request #572 from tvlooy/patch-1
$ wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p290.tar.gz
Tom Van Looy [Wed, 21 Mar 2012 12:53:38 +0000 (13:53 +0100)]
$ wget ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p290.tar.gz
--2012-03-21 13:52:34-- http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p290.tar.gz
Resolving ftp.ruby-lang.org... 221.186.184.68
Connecting to ftp.ruby-lang.org|221.186.184.68|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: unspecified [application/x-tar]
Saving to: `ruby-1.9.2-p290.tar.gz'
[ <=> ] 54,691,840 3.37M/s in 18s
2012-03-21 13:52:53 (2.85 MB/s) - `ruby-1.9.2-p290.tar.gz' saved [
54691840]
[tom.vanlooy@itr232l ~/Desktop]
$ file ruby-1.9.2-p290.tar.gz
ruby-1.9.2-p290.tar.gz: POSIX tar archive (GNU)
Steven Verbeek [Wed, 21 Mar 2012 03:21:34 +0000 (00:21 -0300)]
merging upstream changes
Dmitriy Zaporozhets [Tue, 20 Mar 2012 21:59:35 +0000 (23:59 +0200)]
Push events polished
Steven Verbeek [Tue, 20 Mar 2012 00:57:29 +0000 (21:57 -0300)]
merging upstream changes
Steven Verbeek [Tue, 20 Mar 2012 00:43:25 +0000 (21:43 -0300)]
Fixed tab indent.
Steven Verbeek [Tue, 20 Mar 2012 00:32:08 +0000 (21:32 -0300)]
Added badge, made the issue list smaller height wise, and moved # NOTES over to # comments
Dmitriy Zaporozhets [Mon, 19 Mar 2012 22:05:35 +0000 (00:05 +0200)]
Merged activities & projects pages
Dmitriy Zaporozhets [Mon, 19 Mar 2012 20:52:16 +0000 (22:52 +0200)]
Activities page added. Dashboard few specs. Preparing for 2.3
Steven Verbeek [Sat, 17 Mar 2012 16:13:42 +0000 (13:13 -0300)]
Small fix.
Steven Verbeek [Sat, 17 Mar 2012 16:02:48 +0000 (13:02 -0300)]
Fixed code in issue details, changed form description to details.
Steven Verbeek [Sat, 17 Mar 2012 15:49:23 +0000 (12:49 -0300)]
Fix for readme code being yellow in code blocks (left it yellow outside code blocks)
Steven Verbeek [Sat, 17 Mar 2012 06:31:38 +0000 (03:31 -0300)]
Fixed row messed up. Started on overall look.
Steven Verbeek [Sat, 17 Mar 2012 05:48:22 +0000 (02:48 -0300)]
Fixed HR
Steven Verbeek [Sat, 17 Mar 2012 05:46:47 +0000 (02:46 -0300)]
Fixed css issues with issues :)
Steven Verbeek [Sat, 17 Mar 2012 05:24:51 +0000 (02:24 -0300)]
Added markdown is enabled.
Steven Verbeek [Sat, 17 Mar 2012 05:22:12 +0000 (02:22 -0300)]
Re-added back to issues list, but moved it above title. Added css to move issue meta data around.
Steven Verbeek [Sat, 17 Mar 2012 05:17:04 +0000 (02:17 -0300)]
Moved OPEN and removed back link (you can easily click on issues to get to the same spot)
Steven Verbeek [Sat, 17 Mar 2012 05:13:36 +0000 (02:13 -0300)]
Fixed markdown.
Steven Verbeek [Sat, 17 Mar 2012 05:09:16 +0000 (02:09 -0300)]
Markdown for issue description, added issue title
Steven Verbeek [Sat, 17 Mar 2012 04:17:37 +0000 (01:17 -0300)]
db migrate file
Steven Verbeek [Sat, 17 Mar 2012 03:24:40 +0000 (00:24 -0300)]
Added issue description.
Steven Verbeek [Sat, 17 Mar 2012 02:48:29 +0000 (23:48 -0300)]
Changed some more wording
Steven Verbeek [Sat, 17 Mar 2012 02:43:28 +0000 (23:43 -0300)]
Changed title to issue message (name) and changed Save to Submit new issue.
Steven Verbeek [Sat, 17 Mar 2012 01:42:54 +0000 (22:42 -0300)]
Small change to search icon to make it more middle aligned.
Steven Verbeek [Sat, 17 Mar 2012 01:40:36 +0000 (22:40 -0300)]
Fix for search input when focused, no longer turns blue.