home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 17:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
8955 Commits
Author SHA1 Message Date
Ciro Santilli 705fe01dca Factor issue and edit MR form label field and submit. 2014-09-22 21:24:25 +02:00
Ciro Santilli 778afb699f Replace javascript:; links with buttons. 2014-09-22 21:01:19 +02:00
Dmitriy Zaporozhets 248990b5e8 Merge pull request #7772 from cirosantilli/resize-vertical 
[UI] Set textarea resize:vertical by default.
 2014-09-22 21:03:57 +03:00
Dmitriy Zaporozhets e54fdee436 Merge pull request #7657 from cirosantilli/factor-commit-list 
[refactor] Factor out commit list from compare and new MR.
 2014-09-22 21:03:29 +03:00
Dmitriy Zaporozhets 6a1323f12a Merge pull request #7792 from cirosantilli/link_to_reply_diff 
Fix link_to_reply_diff.
 2014-09-22 21:02:43 +03:00
Dmitriy Zaporozhets f96b954b1c Merge pull request #7804 from cirosantilli/factor-issue-mr-form-error 
Factor issue and MR edit form error list.
 2014-09-22 21:01:03 +03:00
Dmitriy Zaporozhets db12e2dc8d Merge pull request #7807 from cirosantilli/factor-service-error 
Factor error and success methods from services.
 2014-09-22 21:00:11 +03:00
Dmitriy Zaporozhets ed9a6bf99c Merge pull request #7758 from bbodenmiller/patch-1 
cleanup empty repo page
 2014-09-22 20:57:27 +03:00
Dmitriy Zaporozhets 8cd882355e Merge branch '7-4-pre' into 'master' 
7.4 development

Development branch during `master` code freeze for 7.3

See merge request !1096
 2014-09-22 17:25:49 +00:00
Marin Jankovski f0231e409a Revert "Diff headers made sticky." 
This reverts commit 6eb85b1a30.
 2014-09-22 13:48:28 +02:00
Sytse Sijbrandij 4160180621 Improve the wording explaining protected branches. 2014-09-22 12:25:07 +02:00
Robert Schilling 28ba985ef9 Save last scrollposition and scroll back when leaving ZEN mode 2014-09-21 21:06:38 +02:00
Ciro Santilli ad47993ac4 Factor error and success methods from services. 2014-09-21 11:43:05 +02:00
Dmitriy Zaporozhets 9971a9692a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-20 19:22:42 +03:00
Robert Schilling d5badd7ef6 Prevent default action when closing zen mode 2014-09-20 18:15:36 +02:00
Ciro Santilli eb033aa60e Factor issue and MR edit form error list. 2014-09-20 18:02:01 +02:00
Robert Schilling 8fd0d74bd8 Merge pull request #7801 from cirosantilli/dry-zen-view 
Factor zen mode.
 2014-09-20 17:09:20 +02:00
Ciro Santilli adaec60a50 Factor zen mode. 2014-09-20 15:32:46 +02:00
Dmitriy Zaporozhets 6485570482 Increase atom feed test coverage. Prevent 500 error if description is missing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-20 11:55:58 +03:00
Ciro Santilli 0576c028cc Set textarea resize:vertical by default. 2014-09-19 23:16:02 +02:00
Robert Schilling d40311a91d Merge pull request #7788 from bbodenmiller/patch-25 
link to page that discusses how to generate ssh key
 2014-09-19 20:34:34 +02:00
Ciro Santilli 04ef3ddc6c Improve zen mode internals. 2014-09-19 17:32:23 +02:00
Ciro Santilli 29a0d993b0 Factor .add-diff-note active state. 2014-09-19 16:16:45 +02:00
Dmitriy Zaporozhets eb764b1b7b Fix star/fork button UI issue if count > 100 2014-09-19 12:33:09 +00:00
Ciro Santilli 9439602edc Fix link_to_reply_diff. 2014-09-19 14:15:24 +02:00
Ben Bodenmiller 9a1fe30682 link to page that discusses how to generate ssh key 2014-09-19 02:17:22 -07:00
Dmitriy Zaporozhets 4a21db82ec Merge branch 'first-meaningful-line-in-md' of https://github.com/yglukhov/gitlabhq into 7-4-pre 2014-09-17 21:37:34 +03:00
Dmitriy Zaporozhets 8bff9a4098 Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre 2014-09-17 21:31:41 +03:00
Dmitriy Zaporozhets 6dff16a679 Merge branch 'readme-anchor' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre 2014-09-17 21:31:22 +03:00
Ben Bodenmiller dcc51b0d2c cleanup empty repo page 
Improve wording on empty repo page and make header capitalization consistent
 2014-09-16 21:48:08 -07: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 4f1bb91a75 Fix finder and tests for new membership models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 16:45:28 +03: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 09b23228df Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-15 10:20:43 +03:00
Dmitriy Zaporozhets 79190fe06b Merge branch 'implement_comments_on_parallel_diff' into 'master' 
Implement comments on parallel diff

Fixes #1565

See merge request !1090
 2014-09-15 07:19:50 +00: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
Tamer Sherif a391cd21d7 Fix grammatical error in 'not merged changes' msg 2014-09-14 12:31:32 +03:00
Ciro Santilli 1da0c0b6e4 Factor out commit list from compare and new MR. 2014-09-14 10:15:14 +02:00
Marin Jankovski 9945e8c424 Move organizing of comments to helper. 2014-09-12 19:51:44 +02:00
Marin Jankovski e84861d510 Remove unecesarry array operations. 2014-09-12 19:41:32 +02:00
Marin Jankovski 5564fe3149 Add comments on the side-by-side diff. 2014-09-12 18:44:53 +02:00
Wes Gurney 81a70bf515 Adding ability to configure webhook timeout via gitlab.yml 2014-09-12 11:38:14 -04:00
uran 7d9cdc2d37 Source repo is now clickable. 2014-09-12 17:53:08 +03:00