OSDN Git Service
Jacob Vosmaer [Mon, 22 Jul 2013 08:28:50 +0000 (01:28 -0700)]
Merge pull request #4600 from lukaselmer/patch-1
Replace vim by editor
Yves Senn [Sun, 21 Jul 2013 10:41:21 +0000 (03:41 -0700)]
Merge pull request #4605 from jvanbaarsen/installation-manual-fix
Fixed an old reference to puma
Jeroen van Baarsen [Sat, 20 Jul 2013 10:31:13 +0000 (12:31 +0200)]
Fixed an old reference to puma
Lukas Elmer [Fri, 19 Jul 2013 15:29:10 +0000 (17:29 +0200)]
Replace vim by editor
Dmitriy Zaporozhets [Thu, 18 Jul 2013 16:32:13 +0000 (19:32 +0300)]
Doc for update from 5.3 to 5.4
Dmitriy Zaporozhets [Thu, 18 Jul 2013 16:22:35 +0000 (16:22 +0000)]
Merge branch 'nginx_alternatives_in_recipes' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 18 Jul 2013 16:20:50 +0000 (09:20 -0700)]
Merge pull request #4289 from karlhungus/feature-ldap-signin-with-email-or-username
Allow the ldap logins with email or username
Jacob Vosmaer [Thu, 18 Jul 2013 13:36:01 +0000 (15:36 +0200)]
Refer to recipes for nginx alternatives
Izaak Alpert [Thu, 11 Jul 2013 17:05:01 +0000 (13:05 -0400)]
Default allow username or email login to false
-If not specified in the gitlab.yml default this setting to false
Change-Id: I3551df364498dd84ccbd18c90797522e77159f05
Izaak Alpert [Wed, 26 Jun 2013 14:49:29 +0000 (10:49 -0400)]
Update the proc/lamda to be consistent
Change-Id: I411c7544c7834b00d26e51dc9a6c0396c51bd4f3
Izaak Alpert [Tue, 11 Jun 2013 21:15:59 +0000 (17:15 -0400)]
Allow the ldap logins with email or username
Change-Id: I73b4aa4c46afd56ae02fb24abcd673c0724547e4
Dmitriy Zaporozhets [Thu, 18 Jul 2013 11:12:01 +0000 (11:12 +0000)]
Merge branch 'improve/snippets' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 18 Jul 2013 11:11:17 +0000 (14:11 +0300)]
Fix tests
Dmitriy Zaporozhets [Thu, 18 Jul 2013 11:02:04 +0000 (14:02 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Ariejan de Vroom [Thu, 18 Jul 2013 10:59:41 +0000 (12:59 +0200)]
Revert "Update installation.md"
This reverts commit
670e1be7a402b1340393d298c7ebc05930ed7ac3.
Ariejan de Vroom [Thu, 18 Jul 2013 10:59:18 +0000 (12:59 +0200)]
Revert "Update installation.md"
This reverts commit
b5cd66d41de98c63fdb048e3d0ce600c9353e230.
Dmitriy Zaporozhets [Thu, 18 Jul 2013 10:55:01 +0000 (13:55 +0300)]
Use gitlab-shell authorized_keys truncation. Fix issue with authorized_keys stored in different location
Dmitriy Zaporozhets [Thu, 18 Jul 2013 10:33:43 +0000 (13:33 +0300)]
User links to user snippets
Ariejan de Vroom [Thu, 18 Jul 2013 10:27:03 +0000 (03:27 -0700)]
Merge pull request #4564 from mpwoodward/patch-2
Update installation.md
Ariejan de Vroom [Thu, 18 Jul 2013 10:26:26 +0000 (03:26 -0700)]
Merge pull request #4563 from mpwoodward/patch-1
Update installation.md
Ariejan de Vroom [Thu, 18 Jul 2013 10:23:57 +0000 (03:23 -0700)]
Merge pull request #4583 from szicari-cars/master
Updated README.md
Dmitriy Zaporozhets [Thu, 18 Jul 2013 10:22:47 +0000 (13:22 +0300)]
Minor ui fix for snippet
Dmitriy Zaporozhets [Thu, 18 Jul 2013 10:21:56 +0000 (13:21 +0300)]
Improve UI for project snippets
Dmitriy Zaporozhets [Thu, 18 Jul 2013 10:08:48 +0000 (13:08 +0300)]
Add seeds and improve ui. Remove snippet expires_at
Dmitriy Zaporozhets [Thu, 18 Jul 2013 09:06:51 +0000 (12:06 +0300)]
better ui for protected branches page
Dmitriy Zaporozhets [Thu, 18 Jul 2013 08:49:40 +0000 (11:49 +0300)]
squash commit summary in one sentence
Dmitriy Zaporozhets [Thu, 18 Jul 2013 07:29:45 +0000 (10:29 +0300)]
Fix new-tag-btn align
Sean Zicari [Wed, 17 Jul 2013 20:51:12 +0000 (13:51 -0700)]
Update README.md
Updated the relative links in ## Contents to point to the correct documents.
Dmitriy Zaporozhets [Wed, 17 Jul 2013 15:35:28 +0000 (18:35 +0300)]
Update font-awesome. Use proper class for merge request form
Dmitriy Zaporozhets [Wed, 17 Jul 2013 14:03:53 +0000 (14:03 +0000)]
Merge branch 'key_uniqueness' of /home/git/repositories/gitlab/gitlabhq
Jacob Vosmaer [Wed, 17 Jul 2013 13:16:34 +0000 (15:16 +0200)]
Validate fingerprint uniqueness
Jacob Vosmaer [Tue, 2 Jul 2013 12:00:21 +0000 (14:00 +0200)]
Use Tempfile.open for automatic cleanup
Jacob Vosmaer [Tue, 2 Jul 2013 11:39:13 +0000 (13:39 +0200)]
Remove unnecessary user from test
Dmitriy Zaporozhets [Wed, 17 Jul 2013 12:48:22 +0000 (15:48 +0300)]
Restyle MR form page
Dmitriy Zaporozhets [Wed, 17 Jul 2013 12:11:03 +0000 (15:11 +0300)]
create corresponding events when create branch/tag with UI
Dmitriy Zaporozhets [Wed, 17 Jul 2013 11:53:23 +0000 (14:53 +0300)]
remove unnecessary %br and title
Dmitriy Zaporozhets [Wed, 17 Jul 2013 11:43:18 +0000 (14:43 +0300)]
Feature: add git tag via ui
Dmitriy Zaporozhets [Wed, 17 Jul 2013 05:43:56 +0000 (08:43 +0300)]
Fix routing specs
Dmitriy Zaporozhets [Wed, 17 Jul 2013 05:26:00 +0000 (08:26 +0300)]
Improve permissions on tags/branches
Dmitriy Zaporozhets [Wed, 17 Jul 2013 05:15:55 +0000 (08:15 +0300)]
improve new branch page
Dmitriy Zaporozhets [Tue, 16 Jul 2013 21:46:27 +0000 (00:46 +0300)]
Restyle last push widget
Dmitriy Zaporozhets [Tue, 16 Jul 2013 21:09:37 +0000 (00:09 +0300)]
Merge branch 'feature/create_branch'
Dmitriy Zaporozhets [Tue, 16 Jul 2013 21:09:23 +0000 (00:09 +0300)]
Ability to create new branch via UI
Dmitriy Zaporozhets [Tue, 16 Jul 2013 20:35:54 +0000 (23:35 +0300)]
Fix commit tab highlight
Dmitriy Zaporozhets [Tue, 16 Jul 2013 20:27:18 +0000 (23:27 +0300)]
update CHANGELOG
Dmitriy Zaporozhets [Tue, 16 Jul 2013 20:19:59 +0000 (23:19 +0300)]
Fix tags path
Dmitriy Zaporozhets [Tue, 16 Jul 2013 20:14:22 +0000 (23:14 +0300)]
update tests with new routing
Dmitriy Zaporozhets [Tue, 16 Jul 2013 20:12:52 +0000 (23:12 +0300)]
Move repo tags to own controller. add ability to remove tags
Dmitriy Zaporozhets [Tue, 16 Jul 2013 19:43:14 +0000 (22:43 +0300)]
Create event on dashboard when branch removed via UI
Dmitriy Zaporozhets [Tue, 16 Jul 2013 19:25:59 +0000 (22:25 +0300)]
Fix tests and tab highlight
Dmitriy Zaporozhets [Tue, 16 Jul 2013 19:19:07 +0000 (22:19 +0300)]
Move branches list to own controller with pagination. Ability to remove branches from UI
Dmitriy Zaporozhets [Tue, 16 Jul 2013 19:18:14 +0000 (22:18 +0300)]
Add create_branch, rm_branch methods to Gitlab::Shell class
Dmitriy Zaporozhets [Tue, 16 Jul 2013 18:39:39 +0000 (21:39 +0300)]
Require gitlab-shell 1.6.0
Dmitriy Zaporozhets [Tue, 16 Jul 2013 18:10:47 +0000 (11:10 -0700)]
Merge pull request #4562 from Dekadencee/fix_download_link
Fix download link to "other files" in blob
Dmitriy Zaporozhets [Tue, 16 Jul 2013 08:50:00 +0000 (11:50 +0300)]
Update docs
Dmitriy Zaporozhets [Tue, 16 Jul 2013 08:28:19 +0000 (11:28 +0300)]
Add LDAP support to /api/session
Matt Woodward [Mon, 15 Jul 2013 22:35:14 +0000 (15:35 -0700)]
Update installation.md
Additional unicorn -> puma reference update
Matt Woodward [Mon, 15 Jul 2013 22:32:41 +0000 (15:32 -0700)]
Update installation.md
Updated incorrect/outdated references to unicorn.rb; changed to puma.rb
Dekadence [Mon, 15 Jul 2013 21:12:18 +0000 (23:12 +0200)]
Fixed download link from blob for other files
Dmitriy Zaporozhets [Mon, 15 Jul 2013 13:18:47 +0000 (16:18 +0300)]
Fixed network tests
Dmitriy Zaporozhets [Mon, 15 Jul 2013 12:11:34 +0000 (15:11 +0300)]
Remove unecessary titles in admin area
Dmitriy Zaporozhets [Mon, 15 Jul 2013 12:03:56 +0000 (15:03 +0300)]
Determine network height based on window size
Dmitriy Zaporozhets [Mon, 15 Jul 2013 07:15:16 +0000 (00:15 -0700)]
Merge pull request #4553 from hummermania/fix_path_huge_commit
Correct path to view for huge commits. Fix #3996
Dmitriy Zaporozhets [Mon, 15 Jul 2013 07:01:15 +0000 (10:01 +0300)]
Remove unnecessary title. Fix graphs width for less then 1214px resolution
Dmitriy Zaporozhets [Mon, 15 Jul 2013 06:30:33 +0000 (09:30 +0300)]
Few ui fixes: network graph and accept mr button
Markevych Alexander [Sun, 14 Jul 2013 17:54:23 +0000 (20:54 +0300)]
Correct path to view for huge commits. Fix #3996
Dmitriy Zaporozhets [Sun, 14 Jul 2013 17:12:52 +0000 (20:12 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sun, 14 Jul 2013 17:12:23 +0000 (10:12 -0700)]
Merge pull request #4538 from amacarthur/public-project-api2
enhance project creation apis to allow setting of public attribute
Dmitriy Zaporozhets [Sat, 13 Jul 2013 19:14:16 +0000 (19:14 +0000)]
Merge branch 'improve/scss' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sat, 13 Jul 2013 17:53:46 +0000 (20:53 +0300)]
fix tests. improve ui-box title
Dmitriy Zaporozhets [Sat, 13 Jul 2013 17:36:21 +0000 (20:36 +0300)]
Replace %h5.title with div.title
Dmitriy Zaporozhets [Sat, 13 Jul 2013 17:00:46 +0000 (20:00 +0300)]
Fix edit page crash. Minot UI imporvements
Dmitriy Zaporozhets [Sat, 13 Jul 2013 16:39:49 +0000 (19:39 +0300)]
increase search field size. Style header a bit
Yves Senn [Sat, 13 Jul 2013 09:38:35 +0000 (02:38 -0700)]
Merge pull request #4547 from yuters/patch-4
Fix invalid task name migrate_global_keys
Dmitriy Zaporozhets [Sat, 13 Jul 2013 07:13:36 +0000 (10:13 +0300)]
Improving typography
Dmitriy Zaporozhets [Sat, 13 Jul 2013 06:57:54 +0000 (09:57 +0300)]
hide padding for first event row
Dmitriy Zaporozhets [Sat, 13 Jul 2013 06:55:46 +0000 (09:55 +0300)]
Fix dashbord sidebar filter
Dmitriy Zaporozhets [Sat, 13 Jul 2013 06:52:47 +0000 (09:52 +0300)]
scss: rename file_content to file-content etc
Dmitriy Zaporozhets [Sat, 13 Jul 2013 06:47:06 +0000 (09:47 +0300)]
Use bootstrap typography for headers
Dmitriy Zaporozhets [Sat, 13 Jul 2013 06:05:28 +0000 (09:05 +0300)]
remove unnecessary %br/%hr and styles
Dmitriy Zaporozhets [Sat, 13 Jul 2013 05:45:48 +0000 (08:45 +0300)]
Replace page_title with page-title. Correct margin for some blocks/layouts
Martin Bastien [Sat, 13 Jul 2013 01:37:05 +0000 (21:37 -0400)]
Fix invalid task name migrate_global_keys
Dmitriy Zaporozhets [Fri, 12 Jul 2013 18:56:03 +0000 (21:56 +0300)]
Reduce top margin for commit show page box
Dmitriy Zaporozhets [Fri, 12 Jul 2013 18:49:03 +0000 (21:49 +0300)]
REmove duplicating search on dashboard issues/mr
Dmitriy Zaporozhets [Fri, 12 Jul 2013 18:23:56 +0000 (21:23 +0300)]
Fix Help#web_hooks page
Dmitriy Zaporozhets [Fri, 12 Jul 2013 16:15:49 +0000 (19:15 +0300)]
Reduce padding for dashboard elements
Angus MacArthur [Fri, 12 Jul 2013 15:58:17 +0000 (11:58 -0400)]
enhance project creation apis to allow setting of public attribute
Change-Id: Ib71ce8cf993627eada63d7d596fb302ec702f36e
Dmitriy Zaporozhets [Fri, 12 Jul 2013 16:01:39 +0000 (19:01 +0300)]
Rename Group#people to Group#members
Dmitriy Zaporozhets [Fri, 12 Jul 2013 15:29:39 +0000 (18:29 +0300)]
Add group button at Profile#groups page
Dmitriy Zaporozhets [Fri, 12 Jul 2013 15:22:03 +0000 (18:22 +0300)]
Ability to leave group from profile area
Dmitriy Zaporozhets [Fri, 12 Jul 2013 13:18:43 +0000 (16:18 +0300)]
Update schema with snippet content size
Dmitriy Zaporozhets [Fri, 12 Jul 2013 13:17:25 +0000 (13:17 +0000)]
Merge branch '6-0-dev' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 12 Jul 2013 13:16:20 +0000 (16:16 +0300)]
Merge branch 'master' into 6-0-dev
Conflicts:
VERSION
Dmitriy Zaporozhets [Fri, 12 Jul 2013 13:12:23 +0000 (16:12 +0300)]
5.4.0 is rc1
Dmitriy Zaporozhets [Fri, 12 Jul 2013 13:11:45 +0000 (16:11 +0300)]
Update CHANGELOG
Dmitriy Zaporozhets [Fri, 12 Jul 2013 12:45:22 +0000 (05:45 -0700)]
Merge pull request #4324 from axilleas/initd_script
Removal of gitlab.socket should be in stop function too. Fix #4313
Dmitriy Zaporozhets [Fri, 12 Jul 2013 11:42:35 +0000 (14:42 +0300)]
Merge branch 'master' into 6-0-dev
Dmitriy Zaporozhets [Fri, 12 Jul 2013 11:40:47 +0000 (14:40 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Fri, 12 Jul 2013 11:40:27 +0000 (14:40 +0300)]
Fix issues 500 if milestone id exists but milestone is not
Yves Senn [Fri, 12 Jul 2013 09:49:07 +0000 (02:49 -0700)]
Merge pull request #4533 from babatakao/patch-2
Fix typo.