OSDN Git Service

wvm/gitlab.git
11 years agoMerge pull request #4583 from szicari-cars/master
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

11 years agobetter ui for protected branches page
Dmitriy Zaporozhets [Thu, 18 Jul 2013 09:06:51 +0000 (12:06 +0300)]
better ui for protected branches page

11 years agosquash commit summary in one sentence
Dmitriy Zaporozhets [Thu, 18 Jul 2013 08:49:40 +0000 (11:49 +0300)]
squash commit summary in one sentence

11 years agoFix new-tag-btn align
Dmitriy Zaporozhets [Thu, 18 Jul 2013 07:29:45 +0000 (10:29 +0300)]
Fix new-tag-btn align

11 years agoUpdate README.md
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.

11 years agoUpdate font-awesome. Use proper class for merge request form
Dmitriy Zaporozhets [Wed, 17 Jul 2013 15:35:28 +0000 (18:35 +0300)]
Update font-awesome. Use proper class for merge request form

11 years agoMerge branch 'key_uniqueness' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 17 Jul 2013 14:03:53 +0000 (14:03 +0000)]
Merge branch 'key_uniqueness' of /home/git/repositories/gitlab/gitlabhq

11 years agoValidate fingerprint uniqueness
Jacob Vosmaer [Wed, 17 Jul 2013 13:16:34 +0000 (15:16 +0200)]
Validate fingerprint uniqueness

11 years agoUse Tempfile.open for automatic cleanup
Jacob Vosmaer [Tue, 2 Jul 2013 12:00:21 +0000 (14:00 +0200)]
Use Tempfile.open for automatic cleanup

11 years agoRemove unnecessary user from test
Jacob Vosmaer [Tue, 2 Jul 2013 11:39:13 +0000 (13:39 +0200)]
Remove unnecessary user from test

11 years agoRestyle MR form page
Dmitriy Zaporozhets [Wed, 17 Jul 2013 12:48:22 +0000 (15:48 +0300)]
Restyle MR form page

11 years agocreate corresponding events when create branch/tag with UI
Dmitriy Zaporozhets [Wed, 17 Jul 2013 12:11:03 +0000 (15:11 +0300)]
create corresponding events when create branch/tag with UI

11 years agoremove unnecessary %br and title
Dmitriy Zaporozhets [Wed, 17 Jul 2013 11:53:23 +0000 (14:53 +0300)]
remove unnecessary %br and title

11 years agoFeature: add git tag via ui
Dmitriy Zaporozhets [Wed, 17 Jul 2013 11:43:18 +0000 (14:43 +0300)]
Feature: add git tag via ui

11 years agoFix routing specs
Dmitriy Zaporozhets [Wed, 17 Jul 2013 05:43:56 +0000 (08:43 +0300)]
Fix routing specs

11 years agoImprove permissions on tags/branches
Dmitriy Zaporozhets [Wed, 17 Jul 2013 05:26:00 +0000 (08:26 +0300)]
Improve permissions on tags/branches

11 years agoimprove new branch page
Dmitriy Zaporozhets [Wed, 17 Jul 2013 05:15:55 +0000 (08:15 +0300)]
improve new branch page

11 years agoRestyle last push widget
Dmitriy Zaporozhets [Tue, 16 Jul 2013 21:46:27 +0000 (00:46 +0300)]
Restyle last push widget

11 years agoMerge branch 'feature/create_branch'
Dmitriy Zaporozhets [Tue, 16 Jul 2013 21:09:37 +0000 (00:09 +0300)]
Merge branch 'feature/create_branch'

11 years agoAbility to create new branch via UI
Dmitriy Zaporozhets [Tue, 16 Jul 2013 21:09:23 +0000 (00:09 +0300)]
Ability to create new branch via UI

11 years agoFix commit tab highlight
Dmitriy Zaporozhets [Tue, 16 Jul 2013 20:35:54 +0000 (23:35 +0300)]
Fix commit tab highlight

11 years agoupdate CHANGELOG
Dmitriy Zaporozhets [Tue, 16 Jul 2013 20:27:18 +0000 (23:27 +0300)]
update CHANGELOG

11 years agoFix tags path
Dmitriy Zaporozhets [Tue, 16 Jul 2013 20:19:59 +0000 (23:19 +0300)]
Fix tags path

11 years agoupdate tests with new routing
Dmitriy Zaporozhets [Tue, 16 Jul 2013 20:14:22 +0000 (23:14 +0300)]
update tests with new routing

11 years agoMove repo tags to own controller. add ability to remove tags
Dmitriy Zaporozhets [Tue, 16 Jul 2013 20:12:52 +0000 (23:12 +0300)]
Move repo tags to own controller. add ability to remove tags

11 years agoCreate event on dashboard when branch removed via UI
Dmitriy Zaporozhets [Tue, 16 Jul 2013 19:43:14 +0000 (22:43 +0300)]
Create event on dashboard when branch removed via UI

11 years agoFix tests and tab highlight
Dmitriy Zaporozhets [Tue, 16 Jul 2013 19:25:59 +0000 (22:25 +0300)]
Fix tests and tab highlight

11 years agoMove branches list to own controller with pagination. Ability to remove branches...
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

11 years agoAdd create_branch, rm_branch methods to Gitlab::Shell class
Dmitriy Zaporozhets [Tue, 16 Jul 2013 19:18:14 +0000 (22:18 +0300)]
Add create_branch, rm_branch methods to Gitlab::Shell class

11 years agoRequire gitlab-shell 1.6.0
Dmitriy Zaporozhets [Tue, 16 Jul 2013 18:39:39 +0000 (21:39 +0300)]
Require gitlab-shell 1.6.0

11 years agoMerge pull request #4562 from Dekadencee/fix_download_link
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

11 years agoUpdate docs
Dmitriy Zaporozhets [Tue, 16 Jul 2013 08:50:00 +0000 (11:50 +0300)]
Update docs

11 years agoAdd LDAP support to /api/session
Dmitriy Zaporozhets [Tue, 16 Jul 2013 08:28:19 +0000 (11:28 +0300)]
Add LDAP support to /api/session

11 years agoFixed download link from blob for other files
Dekadence [Mon, 15 Jul 2013 21:12:18 +0000 (23:12 +0200)]
Fixed download link from blob for other files

11 years agoFixed network tests
Dmitriy Zaporozhets [Mon, 15 Jul 2013 13:18:47 +0000 (16:18 +0300)]
Fixed network tests

11 years agoRemove unecessary titles in admin area
Dmitriy Zaporozhets [Mon, 15 Jul 2013 12:11:34 +0000 (15:11 +0300)]
Remove unecessary titles in admin area

11 years agoDetermine network height based on window size
Dmitriy Zaporozhets [Mon, 15 Jul 2013 12:03:56 +0000 (15:03 +0300)]
Determine network height based on window size

11 years agoMerge pull request #4553 from hummermania/fix_path_huge_commit
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

11 years agoRemove unnecessary title. Fix graphs width for less then 1214px resolution
Dmitriy Zaporozhets [Mon, 15 Jul 2013 07:01:15 +0000 (10:01 +0300)]
Remove unnecessary title. Fix graphs width for less then 1214px resolution

11 years agoFew ui fixes: network graph and accept mr button
Dmitriy Zaporozhets [Mon, 15 Jul 2013 06:30:33 +0000 (09:30 +0300)]
Few ui fixes: network graph and accept mr button

11 years agoCorrect path to view for huge commits. Fix #3996
Markevych Alexander [Sun, 14 Jul 2013 17:54:23 +0000 (20:54 +0300)]
Correct path to view for huge commits. Fix #3996

11 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sun, 14 Jul 2013 17:12:52 +0000 (20:12 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

11 years agoMerge pull request #4538 from amacarthur/public-project-api2
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

11 years agoMerge branch 'improve/scss' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sat, 13 Jul 2013 19:14:16 +0000 (19:14 +0000)]
Merge branch 'improve/scss' of /home/git/repositories/gitlab/gitlabhq

11 years agofix tests. improve ui-box title
Dmitriy Zaporozhets [Sat, 13 Jul 2013 17:53:46 +0000 (20:53 +0300)]
fix tests. improve ui-box title

11 years agoReplace %h5.title with div.title
Dmitriy Zaporozhets [Sat, 13 Jul 2013 17:36:21 +0000 (20:36 +0300)]
Replace %h5.title with div.title

11 years agoFix edit page crash. Minot UI imporvements
Dmitriy Zaporozhets [Sat, 13 Jul 2013 17:00:46 +0000 (20:00 +0300)]
Fix edit page crash. Minot UI imporvements

11 years agoincrease search field size. Style header a bit
Dmitriy Zaporozhets [Sat, 13 Jul 2013 16:39:49 +0000 (19:39 +0300)]
increase search field size. Style header a bit

11 years agoMerge pull request #4547 from yuters/patch-4
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

11 years agoImproving typography
Dmitriy Zaporozhets [Sat, 13 Jul 2013 07:13:36 +0000 (10:13 +0300)]
Improving typography

11 years agohide padding for first event row
Dmitriy Zaporozhets [Sat, 13 Jul 2013 06:57:54 +0000 (09:57 +0300)]
hide padding for first event row

11 years agoFix dashbord sidebar filter
Dmitriy Zaporozhets [Sat, 13 Jul 2013 06:55:46 +0000 (09:55 +0300)]
Fix dashbord sidebar filter

11 years agoscss: rename file_content to file-content etc
Dmitriy Zaporozhets [Sat, 13 Jul 2013 06:52:47 +0000 (09:52 +0300)]
scss: rename file_content to file-content etc

11 years agoUse bootstrap typography for headers
Dmitriy Zaporozhets [Sat, 13 Jul 2013 06:47:06 +0000 (09:47 +0300)]
Use bootstrap typography for headers

11 years agoremove unnecessary %br/%hr and styles
Dmitriy Zaporozhets [Sat, 13 Jul 2013 06:05:28 +0000 (09:05 +0300)]
remove unnecessary %br/%hr and styles

11 years agoReplace page_title with page-title. Correct margin for some blocks/layouts
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

11 years agoFix invalid task name migrate_global_keys
Martin Bastien [Sat, 13 Jul 2013 01:37:05 +0000 (21:37 -0400)]
Fix invalid task name migrate_global_keys

11 years agoReduce top margin for commit show page box
Dmitriy Zaporozhets [Fri, 12 Jul 2013 18:56:03 +0000 (21:56 +0300)]
Reduce top margin for commit show page box

11 years agoREmove duplicating search on dashboard issues/mr
Dmitriy Zaporozhets [Fri, 12 Jul 2013 18:49:03 +0000 (21:49 +0300)]
REmove duplicating search on dashboard issues/mr

11 years agoFix Help#web_hooks page
Dmitriy Zaporozhets [Fri, 12 Jul 2013 18:23:56 +0000 (21:23 +0300)]
Fix Help#web_hooks page

11 years agoReduce padding for dashboard elements
Dmitriy Zaporozhets [Fri, 12 Jul 2013 16:15:49 +0000 (19:15 +0300)]
Reduce padding for dashboard elements

11 years agoenhance project creation apis to allow setting of public attribute
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

11 years agoRename Group#people to Group#members
Dmitriy Zaporozhets [Fri, 12 Jul 2013 16:01:39 +0000 (19:01 +0300)]
Rename Group#people to Group#members

11 years agoAdd group button at Profile#groups page
Dmitriy Zaporozhets [Fri, 12 Jul 2013 15:29:39 +0000 (18:29 +0300)]
Add group button at Profile#groups page

11 years agoAbility to leave group from profile area
Dmitriy Zaporozhets [Fri, 12 Jul 2013 15:22:03 +0000 (18:22 +0300)]
Ability to leave group from profile area

11 years agoUpdate schema with snippet content size
Dmitriy Zaporozhets [Fri, 12 Jul 2013 13:18:43 +0000 (16:18 +0300)]
Update schema with snippet content size

11 years agoMerge branch '6-0-dev' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 12 Jul 2013 13:17:25 +0000 (13:17 +0000)]
Merge branch '6-0-dev' of /home/git/repositories/gitlab/gitlabhq

11 years agoMerge branch 'master' into 6-0-dev
Dmitriy Zaporozhets [Fri, 12 Jul 2013 13:16:20 +0000 (16:16 +0300)]
Merge branch 'master' into 6-0-dev

Conflicts:
VERSION

11 years ago5.4.0 is rc1
Dmitriy Zaporozhets [Fri, 12 Jul 2013 13:12:23 +0000 (16:12 +0300)]
5.4.0 is rc1

11 years agoUpdate CHANGELOG
Dmitriy Zaporozhets [Fri, 12 Jul 2013 13:11:45 +0000 (16:11 +0300)]
Update CHANGELOG

11 years agoMerge pull request #4324 from axilleas/initd_script
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

11 years agoMerge branch 'master' into 6-0-dev
Dmitriy Zaporozhets [Fri, 12 Jul 2013 11:42:35 +0000 (14:42 +0300)]
Merge branch 'master' into 6-0-dev

11 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Fri, 12 Jul 2013 11:40:47 +0000 (14:40 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

11 years agoFix issues 500 if milestone id exists but milestone is not
Dmitriy Zaporozhets [Fri, 12 Jul 2013 11:40:27 +0000 (14:40 +0300)]
Fix issues 500 if milestone id exists but milestone is not

11 years agoMerge pull request #4533 from babatakao/patch-2
Yves Senn [Fri, 12 Jul 2013 09:49:07 +0000 (02:49 -0700)]
Merge pull request #4533 from babatakao/patch-2

Fix typo.

11 years agoRemoval of gitlab.socket should be in stop function too. Fix #4313
Axilleas Pipinellis [Mon, 17 Jun 2013 08:44:33 +0000 (11:44 +0300)]
Removal of gitlab.socket should be in stop function too. Fix #4313

11 years agoFix typo.
Takao Baba [Fri, 12 Jul 2013 08:44:57 +0000 (17:44 +0900)]
Fix typo.

11 years agoMerge pull request #3993 from bke-drewb/3599
Dmitriy Zaporozhets [Thu, 11 Jul 2013 16:54:15 +0000 (09:54 -0700)]
Merge pull request #3993 from bke-drewb/3599

Issue 3599: Add snippets_enabled flag to projects for API

11 years agoMerge pull request #4264 from andrewwutw/fix-postgresql-restore
Dmitriy Zaporozhets [Thu, 11 Jul 2013 16:52:43 +0000 (09:52 -0700)]
Merge pull request #4264 from andrewwutw/fix-postgresql-restore

Fix PostgreSQL database restoration problem (#4217)

11 years agoMerge pull request #4282 from bke-drewb/3904
Dmitriy Zaporozhets [Thu, 11 Jul 2013 16:50:21 +0000 (09:50 -0700)]
Merge pull request #4282 from bke-drewb/3904

Increase snippet content column size.

11 years agoMerge pull request #4297 from jdurand/patch-1
Dmitriy Zaporozhets [Thu, 11 Jul 2013 16:39:37 +0000 (09:39 -0700)]
Merge pull request #4297 from jdurand/patch-1

Update api.js.coffee

11 years agoMerge pull request #4353 from dirker/allow-import-via-git-protocol
Dmitriy Zaporozhets [Thu, 11 Jul 2013 16:24:19 +0000 (09:24 -0700)]
Merge pull request #4353 from dirker/allow-import-via-git-protocol

project: allow import via git:// url

11 years agoMerge pull request #4398 from Razer6/remove_gitolite_check
Dmitriy Zaporozhets [Thu, 11 Jul 2013 16:23:21 +0000 (09:23 -0700)]
Merge pull request #4398 from Razer6/remove_gitolite_check

Remove gitolite repo check for import script

11 years agoMerge pull request #4502 from wuwx/patch-1
Dmitriy Zaporozhets [Thu, 11 Jul 2013 16:21:53 +0000 (09:21 -0700)]
Merge pull request #4502 from wuwx/patch-1

fix bug when project named: mediawiki

11 years agoMerge pull request #4528 from akiva/master
Dmitriy Zaporozhets [Thu, 11 Jul 2013 16:20:46 +0000 (09:20 -0700)]
Merge pull request #4528 from akiva/master

Allow SSH keys to be of type ecdsa rather than only rsa and dsa (which are slower, older, and weaker)

11 years agoOpen note image attachment in new tab
Dmitriy Zaporozhets [Thu, 11 Jul 2013 06:19:19 +0000 (09:19 +0300)]
Open note image attachment in new tab

11 years agoAllow ecdsa SSH keys
Akiva Levy [Wed, 10 Jul 2013 22:19:52 +0000 (15:19 -0700)]
Allow ecdsa SSH keys

Update app/models/key.rb to permit SSH keys of type ecdsa rather than forcing dsa and rsa algorithms.

11 years agoFix multiple trigger on button attachment
Dmitriy Zaporozhets [Wed, 10 Jul 2013 16:29:54 +0000 (19:29 +0300)]
Fix multiple trigger on button attachment

11 years agoRemove randomly failing test
Dmitriy Zaporozhets [Wed, 10 Jul 2013 16:09:48 +0000 (19:09 +0300)]
Remove randomly failing test

11 years agoRemove randomly failing test
Dmitriy Zaporozhets [Wed, 10 Jul 2013 16:09:48 +0000 (19:09 +0300)]
Remove randomly failing test

11 years agoMerge branch 'master' into 6-0-dev
Dmitriy Zaporozhets [Wed, 10 Jul 2013 11:03:00 +0000 (14:03 +0300)]
Merge branch 'master' into 6-0-dev

Conflicts:
CHANGELOG
VERSION
app/views/admin/teams/projects/new.html.haml
app/views/projects/teams/available.html.haml
doc/install/installation.md

11 years agoMerge pull request #4510 from Razer6/fix_not_found_lexers
Dmitriy Zaporozhets [Wed, 10 Jul 2013 10:58:41 +0000 (03:58 -0700)]
Merge pull request #4510 from Razer6/fix_not_found_lexers

Fix Pygments 500 error if lexer not found by name

11 years agoMerge pull request #4511 from yuters/patch-3
Dmitriy Zaporozhets [Wed, 10 Jul 2013 10:56:51 +0000 (03:56 -0700)]
Merge pull request #4511 from yuters/patch-3

UI : navbar tooltip position fix when "loading" appears.

11 years agoMerge pull request #4515 from amacarthur/fork-admin
Dmitriy Zaporozhets [Wed, 10 Jul 2013 10:54:58 +0000 (03:54 -0700)]
Merge pull request #4515 from amacarthur/fork-admin

Additon of apis for fork administration.

11 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Wed, 10 Jul 2013 10:49:29 +0000 (13:49 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

11 years agoSanitize user attrs on model level
Dmitriy Zaporozhets [Wed, 10 Jul 2013 10:48:03 +0000 (13:48 +0300)]
Sanitize user attrs on model level

11 years agoSanitize user attrs on model level
Dmitriy Zaporozhets [Wed, 10 Jul 2013 10:48:03 +0000 (13:48 +0300)]
Sanitize user attrs on model level

11 years agoMerge pull request #4519 from kwongius/team-assignment-text
Yves Senn [Tue, 9 Jul 2013 18:21:18 +0000 (11:21 -0700)]
Merge pull request #4519 from kwongius/team-assignment-text

Fix header text for setting greatest team access to a project

11 years agoCleaner dashboard sidebar
Dmitriy Zaporozhets [Tue, 9 Jul 2013 17:52:06 +0000 (20:52 +0300)]
Cleaner dashboard sidebar

11 years agoFix User#can_create_project?
Dmitriy Zaporozhets [Tue, 9 Jul 2013 17:51:49 +0000 (20:51 +0300)]
Fix User#can_create_project?