OSDN Git Service

wvm/gitlab.git
11 years agoFix spinach tests
Dmitriy Zaporozhets [Wed, 31 Jul 2013 17:45:25 +0000 (20:45 +0300)]
Fix spinach tests

11 years agoMore descriptions for pages
Dmitriy Zaporozhets [Wed, 31 Jul 2013 14:53:42 +0000 (17:53 +0300)]
More descriptions for pages

11 years agoAdd page titles with for profile area
Dmitriy Zaporozhets [Wed, 31 Jul 2013 14:39:57 +0000 (17:39 +0300)]
Add page titles with for profile area

11 years agoImprove Notifications page. Much easier to find muted projects now
Dmitriy Zaporozhets [Wed, 31 Jul 2013 14:05:22 +0000 (17:05 +0300)]
Improve Notifications page. Much easier to find muted projects now

11 years agoSemibold headers
Dmitriy Zaporozhets [Wed, 31 Jul 2013 13:24:11 +0000 (16:24 +0300)]
Semibold headers

11 years agoImprove project team page usability
Dmitriy Zaporozhets [Wed, 31 Jul 2013 11:33:09 +0000 (14:33 +0300)]
Improve project team page usability

11 years agoMerge pull request #4669 from jackbot/reenable-create-project-button
Dmitriy Zaporozhets [Tue, 30 Jul 2013 13:04:11 +0000 (06:04 -0700)]
Merge pull request #4669 from jackbot/reenable-create-project-button

Reenable the create project button after errors

11 years agoReenable the create project button after errors
Jack Weeden [Tue, 30 Jul 2013 12:05:24 +0000 (13:05 +0100)]
Reenable the create project button after errors

Currently if you try to create a project from an existing repo but give it a bad
URL, you see the "Import url should be a valid url" error and the form, but the
submit button is disabled meaning you can't fix the URL and resubmit the form.
This fix just enables the button when the project has an error.

Closes #4070

11 years agoMerge pull request #4662 from jzi/allow_archive_for_deploy_key
Dmitriy Zaporozhets [Tue, 30 Jul 2013 11:21:57 +0000 (04:21 -0700)]
Merge pull request #4662 from jzi/allow_archive_for_deploy_key

allow all git-upload-* commands for deploy keys

11 years agoextract server-side git commands to constants
Jakub Zienkiewicz [Mon, 29 Jul 2013 14:05:08 +0000 (16:05 +0200)]
extract server-side git commands to constants

11 years agoallow all git-upload-* commands for deploy keys
Jakub Zienkiewicz [Mon, 29 Jul 2013 12:25:33 +0000 (14:25 +0200)]
allow all git-upload-* commands for deploy keys

11 years agoMerge branch 'improve/6-0-update-docs' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Mon, 29 Jul 2013 20:06:12 +0000 (20:06 +0000)]
Merge branch 'improve/6-0-update-docs' of /home/git/repositories/gitlab/gitlabhq

11 years agoMore informative Dashboard#projects page
Dmitriy Zaporozhets [Mon, 29 Jul 2013 19:59:41 +0000 (22:59 +0300)]
More informative Dashboard#projects page

11 years agoFix typo in update docs for 6.0
Dmitriy Zaporozhets [Mon, 29 Jul 2013 19:19:03 +0000 (19:19 +0000)]
Fix typo in update docs for 6.0

11 years agoAdd sing-in button for public area panel
Dmitriy Zaporozhets [Mon, 29 Jul 2013 18:41:05 +0000 (21:41 +0300)]
Add sing-in button for public area panel

11 years agoPrevent top margin for first element in markdown/wiki/readme typography
Dmitriy Zaporozhets [Mon, 29 Jul 2013 18:24:38 +0000 (21:24 +0300)]
Prevent top margin for first element in markdown/wiki/readme typography

11 years agoSuggest MR title based on from branch
Dmitriy Zaporozhets [Mon, 29 Jul 2013 18:17:46 +0000 (21:17 +0300)]
Suggest MR title based on from branch

11 years agoAutofocus to project name at projects#new. Added description field to projects#new...
Dmitriy Zaporozhets [Mon, 29 Jul 2013 18:06:59 +0000 (21:06 +0300)]
Autofocus to project name at projects#new. Added description field to projects#new. Increased timeout for flash message

11 years agoMerge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 29 Jul 2013 17:52:59 +0000 (20:52 +0300)]
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

11 years agoMerge pull request #4667 from seif/patch-1
Dmitriy Zaporozhets [Mon, 29 Jul 2013 17:23:51 +0000 (10:23 -0700)]
Merge pull request #4667 from seif/patch-1

Fix link to emoji cheat sheet

11 years agoAdd deprecations to update docs for 6.0
Dmitriy Zaporozhets [Mon, 29 Jul 2013 17:11:55 +0000 (17:11 +0000)]
Add deprecations to update docs for 6.0

11 years agoFix link to emoji cheat sheet
Seif Attar [Mon, 29 Jul 2013 17:08:45 +0000 (18:08 +0100)]
Fix link to emoji cheat sheet

11 years agoMerge branch 'improve/public_area' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 29 Jul 2013 14:56:11 +0000 (14:56 +0000)]
Merge branch 'improve/public_area' of /home/git/repositories/gitlab/gitlabhq

11 years agoPublic area spinach tests
Dmitriy Zaporozhets [Mon, 29 Jul 2013 14:07:03 +0000 (17:07 +0300)]
Public area spinach tests

11 years agoFix hardcoded condition and unassigned vars
Dmitriy Zaporozhets [Mon, 29 Jul 2013 13:51:04 +0000 (16:51 +0300)]
Fix hardcoded condition and unassigned vars

11 years agoRender readme file in public project#show
Dmitriy Zaporozhets [Mon, 29 Jul 2013 13:50:00 +0000 (16:50 +0300)]
Render readme file in public project#show

11 years agoMerge pull request #4660 from jojosch/fix-typos
Jacob Vosmaer [Mon, 29 Jul 2013 12:11:25 +0000 (05:11 -0700)]
Merge pull request #4660 from jojosch/fix-typos

Fix typos

11 years agoFix typos
Johannes Schleifenbaum [Mon, 29 Jul 2013 10:46:00 +0000 (12:46 +0200)]
Fix typos

11 years agoRemove reference to broken auth icon functionality
Jacob Vosmaer [Mon, 29 Jul 2013 09:12:44 +0000 (11:12 +0200)]
Remove reference to broken auth icon functionality

11 years agoMerge pull request #4651 from mahmouds/patch-1
Yves Senn [Mon, 29 Jul 2013 05:47:37 +0000 (22:47 -0700)]
Merge pull request #4651 from mahmouds/patch-1

fix typo

11 years agoPublic area: Project#show page prototype
Dmitriy Zaporozhets [Sat, 27 Jul 2013 18:23:35 +0000 (21:23 +0300)]
Public area: Project#show page prototype

11 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sat, 27 Jul 2013 17:22:56 +0000 (20:22 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

11 years agoRemove unecessary %br in help area
Dmitriy Zaporozhets [Sat, 27 Jul 2013 16:34:37 +0000 (19:34 +0300)]
Remove unecessary %br in help area

11 years agofix typo
Mahmoud Mostafa [Sat, 27 Jul 2013 10:25:40 +0000 (13:25 +0300)]
fix typo

11 years agoMerge pull request #4634 from jacargentina/master
Dmitriy Zaporozhets [Sat, 27 Jul 2013 07:45:39 +0000 (00:45 -0700)]
Merge pull request #4634 from jacargentina/master

Added show user name as a tooltip on issue participants list

11 years agoShow tooltip with author email for commit
Dmitriy Zaporozhets [Sat, 27 Jul 2013 07:40:38 +0000 (10:40 +0300)]
Show tooltip with author email for commit

11 years agoAdded show user name as a tooltip on every call to link_to_member when the name is...
Javier Castro [Wed, 24 Jul 2013 21:09:56 +0000 (18:09 -0300)]
Added show user name as a tooltip on every call to link_to_member when the name is not shown inline

11 years agoMerge pull request #4619 from thomasbiddle/merge_request_api
Jacob Vosmaer [Fri, 26 Jul 2013 15:00:42 +0000 (08:00 -0700)]
Merge pull request #4619 from thomasbiddle/merge_request_api

Adding links to the merge requests and group documentation.

11 years agoAdding links to the merge requests and group documentation.
TJ Biddle [Fri, 26 Jul 2013 14:53:35 +0000 (07:53 -0700)]
Adding links to the merge requests and group documentation.

11 years agoImprove grammar of label hints
Jacob Vosmaer [Wed, 24 Jul 2013 15:26:14 +0000 (17:26 +0200)]
Improve grammar of label hints

11 years agoMerge pull request #4606 from chaixl/master
Yves Senn [Tue, 23 Jul 2013 09:35:13 +0000 (02:35 -0700)]
Merge pull request #4606 from chaixl/master

Add assets precompile step for fixing activities lost and some UI style issues

11 years agoMerge pull request #4600 from lukaselmer/patch-1
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

11 years agoMerge pull request #4605 from jvanbaarsen/installation-manual-fix
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

11 years agoAdd assets precompile step for fixing activities lost and some UI style issues
Chai Xue Liang [Sat, 20 Jul 2013 11:20:21 +0000 (04:20 -0700)]
Add assets precompile step for fixing activities lost and some UI style issues

11 years agoFixed 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

11 years agoReplace vim by editor
Lukas Elmer [Fri, 19 Jul 2013 15:29:10 +0000 (17:29 +0200)]
Replace vim by editor

11 years agoDoc for update from 5.3 to 5.4
Dmitriy Zaporozhets [Thu, 18 Jul 2013 16:32:13 +0000 (19:32 +0300)]
Doc for update from 5.3 to 5.4

11 years agoMerge branch 'nginx_alternatives_in_recipes' of /home/git/repositories/gitlab/gitlabhq
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

11 years agoMerge pull request #4289 from karlhungus/feature-ldap-signin-with-email-or-username
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

11 years agoRefer to recipes for nginx alternatives
Jacob Vosmaer [Thu, 18 Jul 2013 13:36:01 +0000 (15:36 +0200)]
Refer to recipes for nginx alternatives

11 years agoDefault allow username or email login to false
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

11 years agoUpdate the proc/lamda to be consistent
Izaak Alpert [Wed, 26 Jun 2013 14:49:29 +0000 (10:49 -0400)]
Update the proc/lamda to be consistent

Change-Id: I411c7544c7834b00d26e51dc9a6c0396c51bd4f3

11 years agoAllow the ldap logins with email or username
Izaak Alpert [Tue, 11 Jun 2013 21:15:59 +0000 (17:15 -0400)]
Allow the ldap logins with email or username

Change-Id: I73b4aa4c46afd56ae02fb24abcd673c0724547e4

11 years agoMerge branch 'improve/snippets' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 18 Jul 2013 11:12:01 +0000 (11:12 +0000)]
Merge branch 'improve/snippets' of /home/git/repositories/gitlab/gitlabhq

11 years agoFix tests
Dmitriy Zaporozhets [Thu, 18 Jul 2013 11:11:17 +0000 (14:11 +0300)]
Fix tests

11 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Thu, 18 Jul 2013 11:02:04 +0000 (14:02 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

11 years agoRevert "Update installation.md"
Ariejan de Vroom [Thu, 18 Jul 2013 10:59:41 +0000 (12:59 +0200)]
Revert "Update installation.md"

This reverts commit 670e1be7a402b1340393d298c7ebc05930ed7ac3.

11 years agoRevert "Update installation.md"
Ariejan de Vroom [Thu, 18 Jul 2013 10:59:18 +0000 (12:59 +0200)]
Revert "Update installation.md"

This reverts commit b5cd66d41de98c63fdb048e3d0ce600c9353e230.

11 years agoUse gitlab-shell authorized_keys truncation. Fix issue with authorized_keys stored...
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

11 years agoUser links to user snippets
Dmitriy Zaporozhets [Thu, 18 Jul 2013 10:33:43 +0000 (13:33 +0300)]
User links to user snippets

11 years agoMerge pull request #4564 from mpwoodward/patch-2
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

11 years agoMerge pull request #4563 from mpwoodward/patch-1
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

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 agoMinor ui fix for snippet
Dmitriy Zaporozhets [Thu, 18 Jul 2013 10:22:47 +0000 (13:22 +0300)]
Minor ui fix for snippet

11 years agoImprove UI for project snippets
Dmitriy Zaporozhets [Thu, 18 Jul 2013 10:21:56 +0000 (13:21 +0300)]
Improve UI for project snippets

11 years agoAdd seeds and improve ui. Remove snippet expires_at
Dmitriy Zaporozhets [Thu, 18 Jul 2013 10:08:48 +0000 (13:08 +0300)]
Add seeds and improve ui. Remove snippet expires_at

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 agoUpdate installation.md
Matt Woodward [Mon, 15 Jul 2013 22:35:14 +0000 (15:35 -0700)]
Update installation.md

Additional unicorn -> puma reference update

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