Dmitriy Zaporozhets
20e0c9b132
Rewrite graphs feature
...
* remove commits stats page (will be replaced by graphs)
* remove additions/deletions from graph because of bad performance
* keep graph logic in gitlab
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-26 18:04:41 +03:00
Jeroen Jacobs
430758653c
Adds comments to commits in the API
2014-09-26 10:58:11 +02:00
Dmitriy Zaporozhets
16d530b7b0
Sort projects in search autocomplete by amount of stars. Most popular go first
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-25 19:41:49 +03:00
Dmitriy Zaporozhets
3a106cbcd3
Fix graphs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-25 15:06:41 +03:00
Dmitriy Zaporozhets
4b65b0e0f5
Fix wiki
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-25 13:56:23 +03:00
Dmitriy Zaporozhets
b13c1469a3
Rollback diff drop and set default commit id to HEAD
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-25 12:46:30 +03:00
Dmitriy Zaporozhets
3695ae185b
Decorate commit parents
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-25 12:19:26 +03:00
Dmitriy Zaporozhets
d0e3ab5826
Merge branch 'api/improve-error-reporting' of https://github.com/jubianchi/gitlabhq into jubianchi-api/improve-error-reporting
2014-09-23 21:35:45 +03:00
Dmitriy Zaporozhets
a5d23ae3c8
Fix MR commenting system when new commits pushed
...
This conmmit fixes wierd behaviour when you see wrong comments about new
commits in merge requests.
Short explanation of a bug:
When you push new commits to project we updated `project.merge_requests`
with comment about push. But `project.merge_requests` includes also
merge requests from forks to origin project. So when you push to master
branch it commented on all merge requests from forks to origin where
source_branch was `master`
2014-09-23 14:20:21 +03:00
Ciro Santilli
705fe01dca
Factor issue and edit MR form label field and submit.
2014-09-22 21:24:25 +02:00
jubianchi
998cd3cb63
Improve error reporting on users API
...
* users (#6878 , #3526 , #4209 ): Validation error messages are now exposed through 400 responses, 409 response are sent in case of duplicate email or username
* MRs (#5335 ): 409 responses are sent in case of duplicate merge request (source/target branches), 422 responses are sent when submiting MR fo/from unrelated forks
* issues
* labels
* projects
2014-09-16 01:25:24 +02:00
Dmitriy Zaporozhets
38ed0deaac
Move hook models in separate dir
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-15 11:31:30 +03:00
Dmitriy Zaporozhets
39ab7527d4
Fix project member management
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-15 11:04:25 +03:00
Dmitriy Zaporozhets
bdbadebe3e
Fix adminarea and emails for new membership logic
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-15 10:57:02 +03:00
Dmitriy Zaporozhets
1aa48174db
Fix STI+polymorphic for Group <-> GroupMember
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-14 21:52:54 +03:00
Dmitriy Zaporozhets
13af7de941
Fix migration and association for new members table
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-14 20:38:57 +03:00
Dmitriy Zaporozhets
8210d81381
Replace old references of users_project & users_group
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-14 19:51:54 +03:00
Dmitriy Zaporozhets
c69b8e0459
Huge replace of old users_project and users_group references
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-14 19:32:51 +03:00
Dmitriy Zaporozhets
eb4a9bfbca
Add STI to Member model
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-14 18:09:33 +03:00
Dmitriy Zaporozhets
757426dbb1
Add Member AR model
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-14 17:54:10 +03:00
Wes Gurney
81a70bf515
Adding ability to configure webhook timeout via gitlab.yml
2014-09-12 11:38:14 -04:00
Drew Blessing
09cdd94322
Fix serialize migration. Fixes #7734
2014-09-11 18:41:03 -05:00
Jan-Willem van der Meer
bf0de1a500
Merge remote-tracking branch 'origin/master' into feature-oauth-refactoring
2014-09-11 11:46:08 +02:00
Dmitriy Zaporozhets
6135eb0adf
Merge pull request #7705 from dblessing/serialize_service_properties
...
Serialize service properties
2014-09-10 20:47:47 +03:00
Drew Blessing
a0dbcd2365
Serialize services properties
2014-09-10 09:56:39 -05:00
Dmitriy Zaporozhets
638331d05a
Merge branch 'parallel_diff_refactor' into 'master'
...
Parallel diff refactor
Refactor side-by-side diff to remove code duplication.
Base the side-by-side diff on inline diff code.
In first iteration:
1. commenting on the side-by-side diff is not possible
1. no expanding of the surrounding code
See merge request !1066
2014-09-09 13:57:50 +00:00
Dmitriy Zaporozhets
9e4a40982e
Merge pull request #7646 from bushong1/snippet-search3
...
Adding in snippet search functionality
2014-09-09 10:31:21 +03:00
Dmitriy Zaporozhets
218219abbd
Refactoring inside refactoring. We need to go deeper
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-08 21:54:52 +03:00
Dmitriy Zaporozhets
531f16beb0
Use new diff parsing logic
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-08 16:27:12 +03:00
Dmitriy Zaporozhets
f42a1ded99
Merge pull request #7696 from Zyphrax/master
...
Prevent graph spacing issue
2014-09-07 09:49:48 +03:00
Yvo van Beek
1f355279d2
Remove parent spacing. Fixes #7505
2014-09-06 19:51:28 +10:00
Dmitriy Zaporozhets
fd6b7b4a30
Pluralize commit text for note when push to existing MR
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-05 17:27:53 +03:00
Dmitriy Zaporozhets
b0b05aa28d
Add comment to merge request when new push happens
...
It allows track when user added new commits to existing merge request
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-05 16:56:36 +03:00
Sean Edge
468b2e8e0b
Added annotated tags. Updated tag haml file and call to gitlab-shell. Updated API for annotated tags. Added tests for API. Strip leading/trailing whitespace from message, if present. Update CHANGELOG.
2014-09-04 09:47:20 -04:00
jubianchi and jubianchi
0ac4a933ff
Filters issues by labels via API
2014-09-04 14:41:31 +02:00
Jan-Willem van der Meer
62fc80642d
Refactor Oauth::User class to use instance methods
2014-09-03 15:59:50 +02:00
Lukas Erlacher
40fc4261f2
Add system hook for ssh key changes
...
Add system hook for ssh key create and destroy
Update and fix documentation
Update tests
2014-09-03 01:27:02 +02:00
Charles Bushong
4cca1b050a
Adding in snippet search functionality
...
http://feedback.gitlab.com/forums/176466-general/suggestions/5529795-search-though-snippets
2014-08-29 15:32:07 -04:00
Dmitriy Zaporozhets
01520d5d77
Dont allow edit or remove of system notes
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-08-29 15:19:35 +03:00
Dmitriy Zaporozhets
8b00d01c67
Search by issue/mr title and description
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-08-27 12:47:30 +03:00
Dmitriy Zaporozhets
5d9a5c02d8
Add search method to Note class
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-08-26 23:39:37 +03:00
Dmitriy Zaporozhets
92deb451da
Annotate models
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-08-25 12:25:02 +03:00
Christian Sarazin
4a14b5900b
Added AsciiDoc support and changed to singlequotes
...
extension to https://github.com/gitlabhq/gitlabhq/pull/7568
2014-08-22 12:33:58 +02:00
jubianchi
7ad93ab250
Improve labels validation and expose error messages
2014-08-20 12:09:19 +02:00
Robert Schilling
938eed1ef8
Consistency: Capitalize hex values of sugested colors
2014-08-15 11:02:05 +02:00
Dmitriy Zaporozhets
27cf081e1b
Merge pull request #7479 from Razer6/feature/labels_api
...
Implement complete labels API (create/delete/update)
2014-08-15 10:25:48 +03:00
Dmitriy Zaporozhets
0602c5d027
Change default label color
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-08-15 10:20:12 +03:00
Robert Schilling
cbc90565b5
Do label validation for issues/merge requests API
2014-08-14 10:17:52 +02:00
Robert Schilling
b9519c8314
Validate label titel in project scope
2014-08-13 15:48:26 +02:00
Robert Schilling
c9eaa46c73
Labels need to be valid on name
2014-08-13 15:48:26 +02:00