Dmitriy Zaporozhets
f72dc7f779
dont escape images inside links for gfm. Fixes #2701
2013-01-29 11:00:56 +02:00
Dmitriy Zaporozhets
1c931fb814
fix key observer tests
2013-01-28 23:03:38 +02:00
Dmitriy Zaporozhets
299a9a1040
keys to gitolite via sidekiq now
2013-01-28 21:02:10 +02:00
Dmitriy Zaporozhets
944b2450b1
Merge pull request #2801 from Takuto88/master
...
Fix #2790
2013-01-28 10:33:59 -08:00
Dmitriy Zaporozhets
df6db81e2a
Merge branch 'features/async_gitolite' of dev.gitlabhq.com:gitlab/gitlabhq
2013-01-28 15:54:31 +00:00
Dmitriy Zaporozhets
f7ade3b682
fix tests
2013-01-28 17:53:01 +02:00
Dmitriy Zaporozhets
9ad5fbb416
user factory username over sequence
2013-01-28 17:46:24 +02:00
Dmitriy Zaporozhets
8b54b7233e
Async perform for add/remove team members
2013-01-28 17:39:02 +02:00
Dmitriy Zaporozhets
1c5876eb7b
Do gitolite calls async. Remove satellite with project remove
2013-01-28 17:22:45 +02:00
Lennart Rosam
f9a48f72d4
Fix issue #2790
2013-01-28 13:52:30 +01:00
Riyad Preukschas
b4f16faafd
Merge pull request #2798 from Xylakant/patch-2
...
remove incorrect information about the api version
2013-01-28 04:47:00 -08:00
Lennart Rosam
66ebf8d83f
Merge remote-tracking branch 'github/master'
2013-01-28 13:04:23 +01:00
Lennart Rosam
dc13af90b1
Fix rake task - Update method name
2013-01-28 12:54:07 +01:00
Felix Gilcher
3c47e6248a
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.
2013-01-28 10:59:39 +01:00
Dmitriy Zaporozhets
bd94854929
fix tests
2013-01-28 08:59:34 +02:00
Dmitriy Zaporozhets
e0b5e26035
Merge pull request #2153 from koenpunt/commit-diff-views
...
Added swipe view for image diff
2013-01-27 11:41:23 -08:00
Koen Punt
e33debc214
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
2013-01-27 18:27:32 +01:00
Dmitriy Zaporozhets
558369731f
Add deploy.html for symlink if maintaince
2013-01-27 19:09:40 +02:00
Dmitriy Zaporozhets
552e42f634
Merge pull request #2768 from rlaneve/feature/queued-web-hooks
...
Updates web hooks to process via queue
2013-01-27 08:52:37 -08:00
Dmitriy Zaporozhets
ce0ec05c63
Pager.js to coffee
2013-01-27 18:47:19 +02:00
Dmitriy Zaporozhets
e3c3c67b25
Merge pull request #2787 from gitlabhq/features/projects_page
...
Feature: Projects page
2013-01-27 05:55:22 -08:00
Dmitriy Zaporozhets
d24fd32aa5
feature tests
2013-01-27 15:41:35 +02:00
Dmitriy Zaporozhets
cd47e625f0
Fix features
2013-01-27 14:10:42 +02:00
Dmitriy Zaporozhets
7175b6a769
Fixed dashboard show specs
2013-01-27 13:20:23 +02:00
Dmitriy Zaporozhets
070f49fdc5
Make group name a link at header
2013-01-27 13:12:30 +02:00
Dmitriy Zaporozhets
6b01196fb2
Dashboard to resource
2013-01-27 12:56:20 +02:00
Dmitriy Zaporozhets
bd3b677b86
Add projects page to dashboard. Remove projects pagination on dashboard
2013-01-27 12:34:27 +02:00
Riyad Preukschas
596442f71f
Merge pull request #2784 from AlexDenisov/gitlab_check_environment
...
Missing environment added to 'Try fixing it' block
2013-01-26 11:51:17 -08:00
Alex Denisov
6ab6c55de5
Missed environment added to 'Try fixing it' block
2013-01-26 14:22:48 +00:00
Dmitriy Zaporozhets
b68bba441e
Fix projects in admin -> user -> show
2013-01-26 12:15:38 +02:00
Dmitriy Zaporozhets
0125b74b3c
Fix application crashes after #2772
2013-01-26 12:08:34 +02:00
Dmitriy Zaporozhets
71e89df5e0
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
2013-01-25 13:45:08 -08:00
Dmitriy Zaporozhets
439229efa3
Merge pull request #2777 from zzet/add_project_button
...
Add assign project to team button on team page
2013-01-25 13:42:52 -08:00
Andrey Kumanyaev
890e774ddc
Display actual user role (admin or not) in team members list
2013-01-26 01:14:36 +04:00
Andrey Kumanyaev
b280c2f361
Edit create new team text
2013-01-26 00:38:21 +04:00
Andrey Kumanyaev
45917935ef
fix copied code. Add assign projects button.
2013-01-26 00:37:55 +04:00
Andrey Kumanyaev
75a02e090a
simple cleanup code %)
2013-01-25 23:19:31 +04:00
Andrey Kumanyaev
c5cbbea82e
rewrite admin users controller (use 1 variable and find by username)
2013-01-25 22:38:24 +04:00
Andrey Kumanyaev
ef85202f71
fix links in admin group view page (user links)
2013-01-25 22:37:38 +04:00
Andrey Kumanyaev
916165dfc4
username is default param to User
2013-01-25 22:35:58 +04:00
Andrey Kumanyaev
df64bdffdf
Update user finding (by username) in teams members (team of users) controller
2013-01-25 22:35:31 +04:00
Andrey Kumanyaev
e1679d20c7
Update user finding (by username) in teams_members (project team) controller
2013-01-25 22:34:49 +04:00
Andrey Kumanyaev
f225ff8674
Update user finding (by username) in admin teams members controller
2013-01-25 22:33:49 +04:00
Andrey Kumanyaev
6efda51cc5
fix edit project members access link and page fixes refs #2745
2013-01-25 21:20:15 +04:00
Dmitriy Zaporozhets
5ee8c132a5
Merge pull request #2769 from hiroponz/fix-not-showing-tooltip
...
Fix not showing tooltip on network graph
2013-01-25 08:24:22 -08:00
Sato Hiroyuki
561a0e3a4a
Fix not showing tooltip on network graph
2013-01-26 01:05:17 +09:00
Ryan LaNeve
8a65229b35
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.)
2013-01-25 10:42:57 -05:00
Dmitriy Zaporozhets
639b0a8715
refactor add to team
2013-01-25 17:26:00 +02:00
Dmitriy Zaporozhets
5f3df89c64
Fix teams + gitolite access
2013-01-25 17:18:27 +02:00
Dmitriy Zaporozhets
74e329064a
teams refactoring and cleanup pt.1
2013-01-25 16:36:14 +02:00
