Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e219cf72
Commit
e219cf72
authored
Oct 01, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Annotate!
parent
4aa22754
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
14 additions
and
7 deletions
+14
-7
app/assets/javascripts/api.js.coffee
app/assets/javascripts/api.js.coffee
+3
-3
app/models/group.rb
app/models/group.rb
+1
-1
app/models/merge_request.rb
app/models/merge_request.rb
+1
-0
app/models/namespace.rb
app/models/namespace.rb
+1
-1
app/models/note.rb
app/models/note.rb
+1
-0
app/models/pivotaltracker_service.rb
app/models/pivotaltracker_service.rb
+3
-0
spec/models/group_spec.rb
spec/models/group_spec.rb
+1
-1
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+1
-0
spec/models/namespace_spec.rb
spec/models/namespace_spec.rb
+1
-1
spec/models/note_spec.rb
spec/models/note_spec.rb
+1
-0
No files found.
app/assets/javascripts/api.js.coffee
View file @
e219cf72
...
@@ -3,12 +3,12 @@
...
@@ -3,12 +3,12 @@
user_path
:
"/api/:version/users/:id.json"
user_path
:
"/api/:version/users/:id.json"
notes_path
:
"/api/:version/projects/:id/notes.json"
notes_path
:
"/api/:version/projects/:id/notes.json"
# Get 20 (depends on api) recent notes
# Get 20 (depends on api) recent notes
# and sort the ascending from oldest to newest
# and sort the ascending from oldest to newest
notes
:
(
project_id
,
callback
)
->
notes
:
(
project_id
,
callback
)
->
url
=
Api
.
buildUrl
(
Api
.
notes_path
)
url
=
Api
.
buildUrl
(
Api
.
notes_path
)
url
=
url
.
replace
(
':id'
,
project_id
)
url
=
url
.
replace
(
':id'
,
project_id
)
$
.
ajax
(
$
.
ajax
(
url
:
url
,
url
:
url
,
data
:
data
:
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
# Only active users retrieved
# Only active users retrieved
users
:
(
query
,
callback
)
->
users
:
(
query
,
callback
)
->
url
=
Api
.
buildUrl
(
Api
.
users_path
)
url
=
Api
.
buildUrl
(
Api
.
users_path
)
$
.
ajax
(
$
.
ajax
(
url
:
url
url
:
url
data
:
data
:
...
...
app/models/group.rb
View file @
e219cf72
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
# id :integer not null, primary key
# id :integer not null, primary key
# name :string(255) not null
# name :string(255) not null
# path :string(255) not null
# path :string(255) not null
# owner_id :integer
not null
# owner_id :integer
# created_at :datetime not null
# created_at :datetime not null
# updated_at :datetime not null
# updated_at :datetime not null
# type :string(255)
# type :string(255)
...
...
app/models/merge_request.rb
View file @
e219cf72
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
# merge_status :string(255)
# merge_status :string(255)
# target_project_id :integer not null
# target_project_id :integer not null
# iid :integer
# iid :integer
# description :text
#
#
require
Rails
.
root
.
join
(
"app/models/commit"
)
require
Rails
.
root
.
join
(
"app/models/commit"
)
...
...
app/models/namespace.rb
View file @
e219cf72
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
# id :integer not null, primary key
# id :integer not null, primary key
# name :string(255) not null
# name :string(255) not null
# path :string(255) not null
# path :string(255) not null
# owner_id :integer
not null
# owner_id :integer
# created_at :datetime not null
# created_at :datetime not null
# updated_at :datetime not null
# updated_at :datetime not null
# type :string(255)
# type :string(255)
...
...
app/models/note.rb
View file @
e219cf72
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
# commit_id :string(255)
# commit_id :string(255)
# noteable_id :integer
# noteable_id :integer
# st_diff :text
# st_diff :text
# system :boolean default(FALSE), not null
#
#
require
'carrierwave/orm/activerecord'
require
'carrierwave/orm/activerecord'
...
...
app/models/pivotaltracker_service.rb
View file @
e219cf72
...
@@ -10,6 +10,9 @@
...
@@ -10,6 +10,9 @@
# created_at :datetime not null
# created_at :datetime not null
# updated_at :datetime not null
# updated_at :datetime not null
# active :boolean default(FALSE), not null
# active :boolean default(FALSE), not null
# project_url :string(255)
# subdomain :string(255)
# room :string(255)
#
#
class
PivotaltrackerService
<
Service
class
PivotaltrackerService
<
Service
...
...
spec/models/group_spec.rb
View file @
e219cf72
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
# id :integer not null, primary key
# id :integer not null, primary key
# name :string(255) not null
# name :string(255) not null
# path :string(255) not null
# path :string(255) not null
# owner_id :integer
not null
# owner_id :integer
# created_at :datetime not null
# created_at :datetime not null
# updated_at :datetime not null
# updated_at :datetime not null
# type :string(255)
# type :string(255)
...
...
spec/models/merge_request_spec.rb
View file @
e219cf72
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
# merge_status :string(255)
# merge_status :string(255)
# target_project_id :integer not null
# target_project_id :integer not null
# iid :integer
# iid :integer
# description :text
#
#
require
'spec_helper'
require
'spec_helper'
...
...
spec/models/namespace_spec.rb
View file @
e219cf72
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
# id :integer not null, primary key
# id :integer not null, primary key
# name :string(255) not null
# name :string(255) not null
# path :string(255) not null
# path :string(255) not null
# owner_id :integer
not null
# owner_id :integer
# created_at :datetime not null
# created_at :datetime not null
# updated_at :datetime not null
# updated_at :datetime not null
# type :string(255)
# type :string(255)
...
...
spec/models/note_spec.rb
View file @
e219cf72
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
# commit_id :string(255)
# commit_id :string(255)
# noteable_id :integer
# noteable_id :integer
# st_diff :text
# st_diff :text
# system :boolean default(FALSE), not null
#
#
require
'spec_helper'
require
'spec_helper'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment