Dmitriy Zaporozhets
714ca5189e
Merge branch 'issues_tracker_template' into 'master'
...
Issues trackers template
If admin defines service template, service in project will be prefilled with the template data.
See merge request !1503
2015-02-12 20:02:23 +00:00
Vinnie Okada
b0dacc8eb0
Edit group members via API
...
Add an API endpoint to update the access level of an existing group
member.
2015-02-11 18:53:07 -07:00
Marin Jankovski
29e606deec
Add ExternalIssue base model to make issue referencing more robust for external issue trackers.
2015-02-11 09:21:57 -08:00
Dmitriy Zaporozhets
3c4f7f50fa
Merge branch 'add_label_notes' into 'master'
...
Add label notes
It creates system note, when someone changed labels of issue/MR.
Just look at the screenshot:

Solves this [request] (http://feedback.gitlab.com/forums/176466-general/suggestions/6623258-create-a-note-when-issue-labels-change ).
*P.S. Thanks this [PR](https://github.com/gitlabhq/gitlabhq/pull/8237 ) for idea 😉 . But I need this feature as soon as possible.*
See merge request !331
2015-02-11 01:34:33 +00:00
Nikita Verkhovin
8681cb3137
Add labels notes
2015-02-08 22:35:41 +06:00
Douwe Maan
42422dcc6a
Add internal broadcast message API.
2015-02-07 16:41:30 +01:00
Dmitriy Zaporozhets
89f8020fe1
Merge branch 'mention-groups'
...
Conflicts:
CHANGELOG
2015-02-06 16:45:37 -08:00
Dmitriy Zaporozhets
dd8dd92e50
Merge branch 'api-default-order' into 'master'
...
Sorting refactoring
* refactor sorting logic for web UI
* refactor and document ordering for API: project, issues, merge requests
* explicitly define ordering in models using default_scope
See merge request !1476
2015-02-06 18:08:44 +00:00
Dmitriy Zaporozhets
bdfb349ff7
Refactor and improve sorting objects in API for projects, issues and merge requests
2015-02-05 22:00:54 -08:00
Valery Sizov
b3c90dd514
GitHub importer refactoring
2015-02-05 21:48:21 -08:00
Valery Sizov
1ac20698a5
gitlab.com importer: refactorig
2015-02-05 17:03:43 -08:00
Dmitriy Zaporozhets
62ed1c537e
Explicitly define ordering in models using default_scope
2015-02-05 14:20:55 -08:00
Valery Sizov
93585661b1
code folding
2015-02-05 12:50:34 -08:00
Valery Sizov
33349dd549
GitLab.com integration: refactoring
2015-02-05 12:50:34 -08:00
Valery Sizov
18231b0bb3
GitLab.com integration: refactoring
2015-02-05 12:50:34 -08:00
Valery Sizov
7ddba92a39
Gitlab integration: added tests
2015-02-05 12:50:34 -08:00
Valery Sizov
5194214e3a
GitLab integration. Importer
2015-02-05 12:50:34 -08:00
Douwe Maan
9910b7ff99
Allow groups to be mentioned.
...
Resolves #1673 .
2015-02-05 19:10:52 +01:00
Dmitriy Zaporozhets
72db0c4dc0
Merge pull request #8395 from sbeh/master
...
Socket [::]:123 on Linux listens on IPv4 and IPv6
2015-02-04 14:49:08 -08:00
Dmitriy Zaporozhets
fc13ea7137
Merge pull request #8712 from jvanbaarsen/add-merge-request-files-endpoint
...
Added a way to retrieve MR files
2015-02-04 14:46:54 -08:00
Jeroen van Baarsen
b60d06eb2c
Added a way to retrieve MR files
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com >
2015-02-04 10:24:25 +01:00
Dmitriy Zaporozhets
a8b4756f29
Merge branch 'mwessel/gitlab-ce-configure-protection' into 'master'
...
Mwessel/gitlab ce configure protection
See merge request !1467
2015-02-04 04:25:07 +00:00
Dmitriy Zaporozhets
655fbc6bdd
Dont load rubocop in prod env
2015-02-03 19:25:57 -08:00
Dmitriy Zaporozhets
490cf7bfce
Improve protected branches selectbox options
2015-02-03 18:12:20 -08:00
Dmitriy Zaporozhets
635ebac606
Merge branch 'master' into mwessel/gitlab-ce-configure-protection
2015-02-03 17:54:33 -08:00
Dmitriy Zaporozhets
dc9bf32420
Merge pull request #8723 from jubianchi/api-groups-path
...
Access groups using path
2015-02-03 10:57:27 -08:00
jubianchi
4e97f26649
Acces groups with their path in API
2015-02-03 13:42:38 +01:00
Dmitriy Zaporozhets
61cc6a9244
Rubocop: indentation fixes Yay!!!
2015-02-02 21:59:28 -08:00
Dmitriy Zaporozhets
d04344373b
Rubocop: no trailing newlines
2015-02-02 21:53:27 -08:00
Dmitriy Zaporozhets
7d48205c1a
Rubocop: comment indentation
2015-02-02 21:34:16 -08:00
Dmitriy Zaporozhets
7558fe9875
More rubocop rules enable
2015-02-02 21:31:03 -08:00
Dmitriy Zaporozhets
368e9a0862
Rubocop: Style/CaseIndentation enabled
2015-02-02 21:26:40 -08:00
Dmitriy Zaporozhets
da884aabc7
Avoid using {...} for multi-line blocks
2015-02-02 21:22:57 -08:00
Dmitriy Zaporozhets
cc39bca3fa
Rubocop: Style/AlignHash enabled
2015-02-02 21:15:44 -08:00
Dmitriy Zaporozhets
c427bf08e4
Rubocop: Style/AlignArray enabled
2015-02-02 20:58:28 -08:00
Dmitriy Zaporozhets
e890582681
Rubocop enabled for: Use spaces inside hash literal braces
2015-02-02 20:36:54 -08:00
Dmitriy Zaporozhets
84a5a548a5
Add rubocop to rake test and rake test_ci
2015-02-02 20:08:23 -08:00
Dmitriy Zaporozhets
4f1d1fc51b
Convert hashes to ruby 1.9 style
2015-02-02 19:30:09 -08:00
Robert Speicher
8ac227bab2
Fix RepositoryCache backend attr_reader
2015-01-30 10:17:55 -05:00
Dmitriy Zaporozhets
b21565f18d
Fix semaphore spinach tags
2015-01-29 23:28:38 -08:00
Dmitriy Zaporozhets
23c31a0b12
Skip tricky test for semaphore
2015-01-29 23:06:43 -08:00
Dmitriy Zaporozhets
f1cf49218f
Improve contribution calendar on user page
...
* cache user contributions for day
* ignore forks in calendar contribtuions
2015-01-29 17:07:44 -08:00
Dmitriy Zaporozhets
a3c2873f50
Merge pull request #8676 from tsigo/rs-repository-cache
...
Refactor Repository to use new RepositoryCache class
2015-01-29 16:45:39 -08:00
Marco Wessel
20e269cb92
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-protection
...
Conflicts:
CHANGELOG
db/schema.rb
2015-01-30 00:16:24 +01:00
Dmitriy Zaporozhets
ca701a9649
Improvements to LDAP::User model
...
* method #changed? also tracks changes of identites (fixes issue with email mapping)
* find ldap identity before initialize one
2015-01-29 13:28:41 -08:00
Robert Speicher
4eafc18843
Refactor Repository to use new RepositoryCache class
...
Abstracts away the lower-level implementation details from the
Repository model.
2015-01-29 13:03:47 -05:00
Dmitriy Zaporozhets
c9f18d4587
Make sure we dont have exception on date parsing
2015-01-29 01:03:20 -08:00
Dmitriy Zaporozhets
a9288e554e
Cleanup and make contribution calendar faster
2015-01-29 00:53:43 -08:00
Dmitriy Zaporozhets
6e1f9e746c
Merge branch 'gitlab_importer' into 'master'
...
Ability to clone project using oauth2 token
See merge request !1447
2015-01-29 07:03:30 +00:00
Dmitriy Zaporozhets
c39f80bdb4
Refactor commit calendar a bit. Fixed dates
2015-01-28 23:00:41 -08:00