OSDN Git Service

wvm/gitlab.git
11 years agoEnable to display the commit older than 650th commit.
Sato Hiroyuki [Tue, 5 Feb 2013 03:42:30 +0000 (12:42 +0900)]
Enable to display the commit older than 650th commit.

11 years agoThe commit is marked and displayed in the center.
Sato Hiroyuki [Tue, 5 Feb 2013 03:34:35 +0000 (12:34 +0900)]
The commit is marked and displayed in the center.

11 years agoFix typo.
Sato Hiroyuki [Tue, 5 Feb 2013 03:20:04 +0000 (12:20 +0900)]
Fix typo.

11 years agoDont allow gitlab be loaded in iframe
Dmitriy Zaporozhets [Sat, 2 Feb 2013 18:32:13 +0000 (20:32 +0200)]
Dont allow gitlab be loaded in iframe

11 years agoPort changes from #2803
Riyad Preukschas [Fri, 1 Feb 2013 20:18:09 +0000 (21:18 +0100)]
Port changes from #2803

11 years agoSmall fixes to the installation guide and check task
Riyad Preukschas [Fri, 1 Feb 2013 20:06:15 +0000 (21:06 +0100)]
Small fixes to the installation guide and check task

11 years agoMerge pull request #2440 from klamontagne/master
Riyad Preukschas [Fri, 1 Feb 2013 19:56:03 +0000 (20:56 +0100)]
Merge pull request #2440 from  klamontagne/master

Don't setuid the repositories on installation

11 years agoFix crash on team update
Dmitriy Zaporozhets [Fri, 1 Feb 2013 17:07:54 +0000 (19:07 +0200)]
Fix crash on team update

11 years agoAbility to manage and remove group as owner outside of admin area
Dmitriy Zaporozhets [Fri, 1 Feb 2013 17:04:11 +0000 (19:04 +0200)]
Ability to manage and remove group as owner outside of admin area

11 years agoAdd a delay for sending emails
Dmitriy Zaporozhets [Fri, 1 Feb 2013 15:04:41 +0000 (17:04 +0200)]
Add a delay for sending emails

11 years agoFix mailer tests
Dmitriy Zaporozhets [Fri, 1 Feb 2013 13:37:21 +0000 (15:37 +0200)]
Fix mailer tests

11 years agofix app crash if author is missing
Dmitriy Zaporozhets [Fri, 1 Feb 2013 07:33:12 +0000 (09:33 +0200)]
fix app crash if author is missing

11 years agoFix sending commit note email to id instead email
Dmitriy Zaporozhets [Fri, 1 Feb 2013 06:59:30 +0000 (08:59 +0200)]
Fix sending commit note email to id instead email

11 years agoMerge pull request #2839 from m4tthumphrey/protected-branches-api
Dmitriy Zaporozhets [Thu, 31 Jan 2013 18:44:20 +0000 (10:44 -0800)]
Merge pull request #2839 from m4tthumphrey/protected-branches-api

Added methods to protect and unprotect branches in from the API

11 years agofix notes specs
Dmitriy Zaporozhets [Thu, 31 Jan 2013 11:13:17 +0000 (13:13 +0200)]
fix notes specs

11 years agoMerge branch 'extend_user_api' of https://github.com/bladealslayer/gitlabhq into...
Dmitriy Zaporozhets [Thu, 31 Jan 2013 11:00:50 +0000 (13:00 +0200)]
Merge branch 'extend_user_api' of https://github.com/bladealslayer/gitlabhq into bladealslayer-extend_user_api

Conflicts:
spec/requests/api/users_spec.rb

11 years agoMerge pull request #2711 from fbehrens/patch-1
Dmitriy Zaporozhets [Thu, 31 Jan 2013 10:54:48 +0000 (02:54 -0800)]
Merge pull request #2711 from fbehrens/patch-1

Update config/database.yml.postgresql

11 years agoMerge pull request #2855 from hiroponz/fix-bug-of-network-graph
Dmitriy Zaporozhets [Thu, 31 Jan 2013 10:33:59 +0000 (02:33 -0800)]
Merge pull request #2855 from hiroponz/fix-bug-of-network-graph

Fix bug of network graph(#2847) and trivial code clean up.

11 years agofix active tabs tests
Dmitriy Zaporozhets [Thu, 31 Jan 2013 10:08:56 +0000 (12:08 +0200)]
fix active tabs tests

11 years agoAdded methods to protect and unprotect branches
Matt Humphrey [Mon, 28 Jan 2013 17:22:44 +0000 (17:22 +0000)]
Added methods to protect and unprotect branches

11 years agoa bit of restyling. Replace some images with icons. Simplify note form
Dmitriy Zaporozhets [Thu, 31 Jan 2013 09:22:06 +0000 (11:22 +0200)]
a bit of restyling. Replace some images with icons. Simplify note form

11 years agoFix bug of network graph(#2847) and trivial code clean up.
Sato Hiroyuki [Thu, 31 Jan 2013 08:29:36 +0000 (17:29 +0900)]
Fix bug of network graph(#2847) and trivial code clean up.

11 years agofix routing specs
Dmitriy Zaporozhets [Thu, 31 Jan 2013 08:08:20 +0000 (10:08 +0200)]
fix routing specs

11 years agoadd path and path_with_namespace to api project entity
Dmitriy Zaporozhets [Thu, 31 Jan 2013 07:11:35 +0000 (09:11 +0200)]
add path and path_with_namespace to api project entity

11 years agofix pagination issue
Dmitriy Zaporozhets [Thu, 31 Jan 2013 06:55:31 +0000 (08:55 +0200)]
fix pagination issue

11 years agomissing doc for api
Dmitriy Zaporozhets [Thu, 31 Jan 2013 06:46:59 +0000 (08:46 +0200)]
missing doc for api

11 years agoadd specs for api -> merge request notes
Dmitriy Zaporozhets [Thu, 31 Jan 2013 06:42:11 +0000 (08:42 +0200)]
add specs for api -> merge request notes

11 years agoMerge pull request #2842 from inome/ExposeMergeRequestAsNotable
Dmitriy Zaporozhets [Thu, 31 Jan 2013 06:25:02 +0000 (22:25 -0800)]
Merge pull request #2842 from inome/ExposeMergeRequestAsNotable

Expose MergeRequest object as a notable in the API to allow for easy ret...

11 years agoMerge pull request #2852 from hiroponz/displaying-commit-on-new-window
Dmitriy Zaporozhets [Thu, 31 Jan 2013 06:23:33 +0000 (22:23 -0800)]
Merge pull request #2852 from hiroponz/displaying-commit-on-new-window

Displaying commit on a new window, when clicking commit on network graph.

11 years agoMerge pull request #2847 from hiroponz/improve-overlap-lines
Dmitriy Zaporozhets [Thu, 31 Jan 2013 06:22:37 +0000 (22:22 -0800)]
Merge pull request #2847 from hiroponz/improve-overlap-lines

Improve overlap of lines in network graph

11 years agoMerge pull request #2823 from hiroponz/switchable-branch-on-network-graph
Dmitriy Zaporozhets [Thu, 31 Jan 2013 06:21:19 +0000 (22:21 -0800)]
Merge pull request #2823 from hiroponz/switchable-branch-on-network-graph

Switchable the main branch on network graph

11 years agoFix wrong path of features.
Sato Hiroyuki [Thu, 31 Jan 2013 04:22:08 +0000 (13:22 +0900)]
Fix wrong path of features.

11 years agoDisplaying commit on a new window, when clicking commit on network graph.
Sato Hiroyuki [Thu, 31 Jan 2013 01:37:23 +0000 (10:37 +0900)]
Displaying commit on a new window, when clicking commit on network graph.

11 years agoMerge branch 'refactor/css' of dev.gitlabhq.com:gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 30 Jan 2013 17:28:48 +0000 (17:28 +0000)]
Merge branch 'refactor/css' of dev.gitlabhq.com:gitlab/gitlabhq

11 years agoFew usability improvments
Dmitriy Zaporozhets [Wed, 30 Jan 2013 15:13:05 +0000 (17:13 +0200)]
Few usability improvments

11 years agoFixed link_to_member
Dmitriy Zaporozhets [Wed, 30 Jan 2013 15:07:44 +0000 (17:07 +0200)]
Fixed link_to_member

11 years agoa bit of split up for gitlab-bootstrap
Dmitriy Zaporozhets [Wed, 30 Jan 2013 15:01:58 +0000 (17:01 +0200)]
a bit of split up for gitlab-bootstrap

11 years agoremove old alert messages
Dmitriy Zaporozhets [Wed, 30 Jan 2013 14:53:18 +0000 (16:53 +0200)]
remove old alert messages

11 years agoImprove overlap of lines in network graph
Sato Hiroyuki [Wed, 30 Jan 2013 13:20:00 +0000 (22:20 +0900)]
Improve overlap of lines in network graph

11 years agoreplace right with pull-right
Dmitriy Zaporozhets [Wed, 30 Jan 2013 14:40:43 +0000 (16:40 +0200)]
replace right with pull-right

11 years agoMerge pull request #2837 from xudiera/master
Dmitriy Zaporozhets [Wed, 30 Jan 2013 14:32:02 +0000 (06:32 -0800)]
Merge pull request #2837 from xudiera/master

Fixed a grammar mistake in alert-message.block-message

11 years agoExpose MergeRequest object as a notable in the API to allow for easy retrieval of...
Micah Huff [Wed, 30 Jan 2013 05:15:13 +0000 (21:15 -0800)]
Expose MergeRequest object as a notable in the API to allow for easy retrieval of comments

11 years agoSwitchable the main branch on network graph
Sato Hiroyuki [Tue, 29 Jan 2013 08:25:17 +0000 (17:25 +0900)]
Switchable the main branch on network graph

11 years agofew styling for buttons
Dmitriy Zaporozhets [Tue, 29 Jan 2013 20:57:15 +0000 (22:57 +0200)]
few styling for buttons

11 years agorefactor buttons pt2
Dmitriy Zaporozhets [Tue, 29 Jan 2013 20:29:21 +0000 (22:29 +0200)]
refactor buttons pt2

11 years agorefactor buttons pt1
Dmitriy Zaporozhets [Tue, 29 Jan 2013 20:18:19 +0000 (22:18 +0200)]
refactor buttons pt1

11 years agoFixed a grammar mistake in alert-message.block-message
Carlos Xudiera [Tue, 29 Jan 2013 17:58:34 +0000 (12:58 -0500)]
Fixed a grammar mistake in alert-message.block-message

11 years agoset link to gitlab-ci
Dmitriy Zaporozhets [Tue, 29 Jan 2013 12:49:10 +0000 (14:49 +0200)]
set link to gitlab-ci

11 years agosatellites logs
Dmitriy Zaporozhets [Tue, 29 Jan 2013 10:12:24 +0000 (12:12 +0200)]
satellites logs

11 years agoAdvanced logging for post-receive worker
Dmitriy Zaporozhets [Tue, 29 Jan 2013 09:32:05 +0000 (11:32 +0200)]
Advanced logging for post-receive worker

11 years agodont escape images inside links for gfm. Fixes #2701
Dmitriy Zaporozhets [Tue, 29 Jan 2013 09:00:56 +0000 (11:00 +0200)]
dont escape images inside links for gfm. Fixes #2701

11 years agofix key observer tests
Dmitriy Zaporozhets [Mon, 28 Jan 2013 21:03:38 +0000 (23:03 +0200)]
fix key observer tests

11 years agokeys to gitolite via sidekiq now
Dmitriy Zaporozhets [Mon, 28 Jan 2013 19:02:10 +0000 (21:02 +0200)]
keys to gitolite via sidekiq now

11 years agoMerge pull request #2801 from Takuto88/master
Dmitriy Zaporozhets [Mon, 28 Jan 2013 18:33:59 +0000 (10:33 -0800)]
Merge pull request #2801 from Takuto88/master

Fix #2790

11 years agoMerge branch 'features/async_gitolite' of dev.gitlabhq.com:gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 28 Jan 2013 15:54:31 +0000 (15:54 +0000)]
Merge branch 'features/async_gitolite' of dev.gitlabhq.com:gitlab/gitlabhq

11 years agofix tests
Dmitriy Zaporozhets [Mon, 28 Jan 2013 15:53:01 +0000 (17:53 +0200)]
fix tests

11 years agouser factory username over sequence
Dmitriy Zaporozhets [Mon, 28 Jan 2013 15:46:24 +0000 (17:46 +0200)]
user factory username over sequence

11 years agoAsync perform for add/remove team members
Dmitriy Zaporozhets [Mon, 28 Jan 2013 15:39:02 +0000 (17:39 +0200)]
Async perform for add/remove team members

11 years agoDo gitolite calls async. Remove satellite with project remove
Dmitriy Zaporozhets [Mon, 28 Jan 2013 15:22:45 +0000 (17:22 +0200)]
Do gitolite calls async. Remove satellite with project remove

11 years agoFix issue #2790
Lennart Rosam [Mon, 28 Jan 2013 12:52:30 +0000 (13:52 +0100)]
Fix issue #2790

11 years agoMerge pull request #2798 from Xylakant/patch-2
Riyad Preukschas [Mon, 28 Jan 2013 12:47:00 +0000 (04:47 -0800)]
Merge pull request #2798 from Xylakant/patch-2

remove incorrect information about the api version

11 years agoMerge remote-tracking branch 'github/master'
Lennart Rosam [Mon, 28 Jan 2013 12:04:23 +0000 (13:04 +0100)]
Merge remote-tracking branch 'github/master'

11 years agoFix rake task - Update method name
Lennart Rosam [Mon, 28 Jan 2013 11:54:07 +0000 (12:54 +0100)]
Fix rake task - Update method name

11 years agoremove incorrect information about the api version
Felix Gilcher [Mon, 28 Jan 2013 09:59:39 +0000 (10:59 +0100)]
remove incorrect information about the api version

The API version is currently not equal to the gitlab major version number. Gitlab 4.1 
still uses API version 3. Point to the lib/api.rb file instead which contains the
autoritative information.

11 years agofix tests
Dmitriy Zaporozhets [Mon, 28 Jan 2013 06:59:34 +0000 (08:59 +0200)]
fix tests

11 years agoMerge pull request #2153 from koenpunt/commit-diff-views
Dmitriy Zaporozhets [Sun, 27 Jan 2013 19:41:23 +0000 (11:41 -0800)]
Merge pull request #2153 from koenpunt/commit-diff-views

Added swipe view for image diff

11 years agoUpdated commit diff view with some minor visual modifications
Koen Punt [Sat, 1 Dec 2012 12:49:21 +0000 (13:49 +0100)]
Updated commit diff view with some minor visual modifications
Prepared diff view for multiple view modes

Converted commits.js to coffeescript
image info in separate coffeescript file

Added swipe view mode

Added onion skin viewMode

11 years agoAdd deploy.html for symlink if maintaince
Dmitriy Zaporozhets [Sun, 27 Jan 2013 17:09:40 +0000 (19:09 +0200)]
Add deploy.html for symlink if maintaince

11 years agoMerge pull request #2768 from rlaneve/feature/queued-web-hooks
Dmitriy Zaporozhets [Sun, 27 Jan 2013 16:52:37 +0000 (08:52 -0800)]
Merge pull request #2768 from rlaneve/feature/queued-web-hooks

Updates web hooks to process via queue

11 years agoPager.js to coffee
Dmitriy Zaporozhets [Sun, 27 Jan 2013 16:47:19 +0000 (18:47 +0200)]
Pager.js to coffee

11 years agoMerge pull request #2787 from gitlabhq/features/projects_page
Dmitriy Zaporozhets [Sun, 27 Jan 2013 13:55:22 +0000 (05:55 -0800)]
Merge pull request #2787 from gitlabhq/features/projects_page

Feature: Projects page

11 years agofeature tests
Dmitriy Zaporozhets [Sun, 27 Jan 2013 13:41:35 +0000 (15:41 +0200)]
feature tests

11 years agoFix features
Dmitriy Zaporozhets [Sun, 27 Jan 2013 12:10:42 +0000 (14:10 +0200)]
Fix features

11 years agoFixed dashboard show specs
Dmitriy Zaporozhets [Sun, 27 Jan 2013 11:20:23 +0000 (13:20 +0200)]
Fixed dashboard show specs

11 years agoMake group name a link at header
Dmitriy Zaporozhets [Sun, 27 Jan 2013 11:12:30 +0000 (13:12 +0200)]
Make group name a link at header

11 years agoDashboard to resource
Dmitriy Zaporozhets [Sun, 27 Jan 2013 10:56:20 +0000 (12:56 +0200)]
Dashboard to resource

11 years agoAdd projects page to dashboard. Remove projects pagination on dashboard
Dmitriy Zaporozhets [Sun, 27 Jan 2013 10:34:27 +0000 (12:34 +0200)]
Add projects page to dashboard. Remove projects pagination on dashboard

11 years agoMerge pull request #2784 from AlexDenisov/gitlab_check_environment
Riyad Preukschas [Sat, 26 Jan 2013 19:51:17 +0000 (11:51 -0800)]
Merge pull request #2784 from AlexDenisov/gitlab_check_environment

Missing environment added to 'Try fixing it' block

11 years agoMissed environment added to 'Try fixing it' block
Alex Denisov [Sat, 26 Jan 2013 14:22:48 +0000 (14:22 +0000)]
Missed environment added to 'Try fixing it' block

11 years agoFix projects in admin -> user -> show
Dmitriy Zaporozhets [Sat, 26 Jan 2013 10:15:38 +0000 (12:15 +0200)]
Fix projects in admin -> user -> show

11 years agoFix application crashes after #2772
Dmitriy Zaporozhets [Sat, 26 Jan 2013 10:08:34 +0000 (12:08 +0200)]
Fix application crashes after #2772

11 years agoMerge pull request #2772 from zzet/bugfix/path_and_page-project-member-access-#2745
Dmitriy Zaporozhets [Fri, 25 Jan 2013 21:45:08 +0000 (13:45 -0800)]
Merge pull request #2772 from zzet/bugfix/path_and_page-project-member-access-#2745

fix edit project members access link and page fixes refs #2745

11 years agoMerge pull request #2777 from zzet/add_project_button
Dmitriy Zaporozhets [Fri, 25 Jan 2013 21:42:52 +0000 (13:42 -0800)]
Merge pull request #2777 from zzet/add_project_button

Add assign project to team button on team page

11 years agoDisplay actual user role (admin or not) in team members list
Andrey Kumanyaev [Fri, 25 Jan 2013 21:14:36 +0000 (01:14 +0400)]
Display actual user role (admin or not) in team members list

11 years agoEdit create new team text
Andrey Kumanyaev [Fri, 25 Jan 2013 20:38:21 +0000 (00:38 +0400)]
Edit create new team text

11 years agofix copied code. Add assign projects button.
Andrey Kumanyaev [Fri, 25 Jan 2013 20:37:55 +0000 (00:37 +0400)]
fix copied code. Add assign projects button.

11 years agosimple cleanup code %)
Andrey Kumanyaev [Fri, 25 Jan 2013 19:19:31 +0000 (23:19 +0400)]
simple cleanup code %)

11 years agorewrite admin users controller (use 1 variable and find by username)
Andrey Kumanyaev [Fri, 25 Jan 2013 18:38:24 +0000 (22:38 +0400)]
rewrite admin users controller (use 1 variable and find by username)

11 years agofix links in admin group view page (user links)
Andrey Kumanyaev [Fri, 25 Jan 2013 18:37:38 +0000 (22:37 +0400)]
fix links in admin group view page (user links)

11 years agousername is default param to User
Andrey Kumanyaev [Fri, 25 Jan 2013 18:35:58 +0000 (22:35 +0400)]
username is default param to User

11 years agoUpdate user finding (by username) in teams members (team of users) controller
Andrey Kumanyaev [Fri, 25 Jan 2013 18:35:31 +0000 (22:35 +0400)]
Update user finding (by username) in teams members (team of users) controller

11 years agoUpdate user finding (by username) in teams_members (project team) controller
Andrey Kumanyaev [Fri, 25 Jan 2013 18:34:49 +0000 (22:34 +0400)]
Update user finding (by username) in teams_members (project team) controller

11 years agoUpdate user finding (by username) in admin teams members controller
Andrey Kumanyaev [Fri, 25 Jan 2013 18:33:49 +0000 (22:33 +0400)]
Update user finding (by username) in admin teams members controller

11 years agofix edit project members access link and page fixes refs #2745
Andrey Kumanyaev [Fri, 25 Jan 2013 17:20:15 +0000 (21:20 +0400)]
fix edit project members access link and page fixes refs #2745

11 years agoMerge pull request #2769 from hiroponz/fix-not-showing-tooltip
Dmitriy Zaporozhets [Fri, 25 Jan 2013 16:24:22 +0000 (08:24 -0800)]
Merge pull request #2769 from hiroponz/fix-not-showing-tooltip

Fix not showing tooltip on network graph

11 years agoFix not showing tooltip on network graph
Sato Hiroyuki [Fri, 25 Jan 2013 15:52:11 +0000 (00:52 +0900)]
Fix not showing tooltip on network graph

11 years agoUpdates project to process web hooks async via sidekiq.
Ryan LaNeve [Thu, 24 Jan 2013 20:15:24 +0000 (15:15 -0500)]
Updates project to process web hooks async via sidekiq.

A new queue of "project_web_hook" is used to process web hooks asynchronously, allowing each to succeed/fail (and be retried) independently.

(Basically, project web hooks now process the same as system hooks.)

11 years agorefactor add to team
Dmitriy Zaporozhets [Fri, 25 Jan 2013 15:26:00 +0000 (17:26 +0200)]
refactor add to team

11 years agoFix teams + gitolite access
Dmitriy Zaporozhets [Fri, 25 Jan 2013 15:18:27 +0000 (17:18 +0200)]
Fix teams + gitolite access

11 years agoteams refactoring and cleanup pt.1
Dmitriy Zaporozhets [Fri, 25 Jan 2013 14:36:14 +0000 (16:36 +0200)]
teams refactoring and cleanup pt.1