home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,195 Commits 48 Branches 340 Tags
8df66046d90cc4f4c53d8cf67ca2af5fcf87fd49
Commit Graph
4817 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 650d0bc695 Merge branch 'improve-oauth' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-04-07 17:15:31 +03:00
Dmitriy Zaporozhets e6f58cb87d Avoid false validation when create user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:47:37 +03:00
Dmitriy Zaporozhets 4ab32be8a7 Dont care about emails for oauth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 15:20:40 +03:00
dosire 6e4dbde2e7 Improve actionability of notice. 2014-04-07 14:14:14 +02:00
Dmitriy Zaporozhets 84d17f7965 Skip require email for devise controllers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 14:32:59 +03:00
Dmitriy Zaporozhets a73df4f72d Allow oauth signup without email 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 14:09:29 +03:00
Dmitriy Zaporozhets bfd4494890 Merge branch 'show_diff' into 'master' 
Show note diff if diff exists
 2014-04-06 17:01:15 +00:00
Dmitriy Zaporozhets 8e7f80eed1 Restyle merge request accept and ci widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-06 17:10:37 +03:00
Dmitriy Zaporozhets bc40efa19d Merge pull request #6705 from razielgn/slack-service-attachments 
Improved Slack integration with message attachments.
 2014-04-06 14:27:02 +03:00
Dmitriy Zaporozhets 7ced2eb447 Use normal btn size for test service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-06 14:26:24 +03:00
Dmitriy Zaporozhets ae2089a98e Fix autocomplete css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-06 14:10:48 +03:00
Dmitriy Zaporozhets 1a17289bd3 Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/javascripts/merge_requests.js.coffee
	app/assets/stylesheets/sections/merge_requests.scss
	app/controllers/projects/merge_requests_controller.rb
 2014-04-06 13:54:54 +03:00
Federico Ravasio 6a9eb4b231 Improved Slack integration with message attachments. 2014-04-06 11:57:48 +02:00
Dmitriy Zaporozhets 2ceef76917 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-04-06 10:16:44 +03:00
Timm Drevensek 4d1945028e Merge branch 'master' into request/relative_submodules 2014-04-04 23:50:39 +02:00
Marin Jankovski 17bb700712 Only show diff it exists. 2014-04-04 19:12:23 +02:00
Dmitriy Zaporozhets 3d2c81856c Merge branch 'deduplicate-help' into 'master' 
Deduplicate help
 2014-04-04 15:18:42 +00:00
Dmitriy Zaporozhets 14b68586b8 Merge branch 'no_email_on_notification_level_change' into 'master' 
Don't send emails on notification level change
 2014-04-04 09:30:16 +00:00
dosire 6205b068cd Reduce the number of times people send emails or file issues out of the blue. 2014-04-04 08:05:09 +02:00
Dmitriy Zaporozhets 860f159d41 Add note when MR assignee changes. Add more tests to MR services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 18:16:05 +03:00
Dmitriy Zaporozhets 8cc5e85543 Mention protected branch force push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 17:06:11 +03:00
Marin Jankovski 0e7665e09b Only send email when project access level changes. 2014-04-03 13:24:05 +02:00
Dmitriy Zaporozhets 1eec1f4f20 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-04-03 12:56:09 +03:00
Dmitriy Zaporozhets a7ab029d22 Merge branch 'reduce-observers' into 'master' 
Remove some observers
 2014-04-03 09:55:46 +00:00
Dmitriy Zaporozhets 9b6224f99c More test fixes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 12:05:21 +03:00
Dmitriy Zaporozhets 76c4421b26 Merge pull request #6639 from yatish27/ConsistentJSFormat 
Consistent format for class objects in javascript
 2014-04-03 11:36:44 +03:00
Dmitriy Zaporozhets 9b598fa62d Fix MR fork validation and services load 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 10:36:10 +03:00
Marin Jankovski 7ab46b969f Do not require modernizr. 2014-04-03 08:49:34 +02:00
Dmitriy Zaporozhets 9ee697dd68 Use MergeRequest services in API and controllers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 21:51:53 +03:00
Dmitriy Zaporozhets 3c867dfa8e MergeRequest services for create, update, close and reopen 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 21:51:17 +03:00
Dmitriy Zaporozhets 65cd9829ee Remove MergeRequest observer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 21:35:59 +03:00
Dmitriy Zaporozhets 6ae2529041 Remove KeysObserver 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 21:13:05 +03:00
Dmitriy Zaporozhets 599344583b Remove EmailsObserver 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 21:02:02 +03:00
Dmitriy Zaporozhets 3faa14e7a7 Merge branch 'reduce-observers' into 'master' 
Move issue create/update code to services

Reduce observers role in GitLab code
 2014-04-02 17:54:27 +00:00
Dmitriy Zaporozhets 49f977d675 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 19:55:23 +03:00
Dmitriy Zaporozhets 2ab53dfb1c Merge branch 'issue_search_filter' into 'master' 
Fix reset of issue search on submit
 2014-04-02 15:30:13 +00:00
Dmitriy Zaporozhets ea347323c9 Merge branch 'fix-jquery-assets' into 'master' 
Replace custom jquery css with native one.

Fixes wrong assets path for calendar in production
 2014-04-02 14:04:36 +00:00
Dmitriy Zaporozhets 1b5fb4ac21 Fix assignee change in Issues::UpdateService 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 16:08:49 +03:00
Dmitriy Zaporozhets ed67ba9663 Add support for close/reopen actions in update service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 15:50:50 +03:00
Dmitriy Zaporozhets cc77365488 Create services for issue close and reopen 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 15:38:24 +03:00
Dmitriy Zaporozhets 0d41f6f0a3 Remove issue observer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 15:37:57 +03:00
Dmitriy Zaporozhets f38eddc69e Replace custom jquery css with native one. Fixes wrong assets path for calendar in production 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 14:57:00 +03:00
Dmitriy Zaporozhets 09d24a1f67 Better title suggestion for new MR 
Ex. if branch named "refactor-models" then title will be "Refactor models"

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 14:16:37 +03:00
Dmitriy Zaporozhets c4e81ed9de Move update issue code to separate service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 13:54:41 +03:00
Dmitriy Zaporozhets cfd9fd30d6 Move code for issue creation to service. 
The goal of suych refactoring is to get rid of observers.
Its much easier to test and code when object creation and all other
related actions done in one class instead of splited across observers,
callbacks etc.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 13:38:35 +03:00
Marin Jankovski b06f43288a Pass the required parameters on search submit. 2014-04-02 12:26:09 +02:00
Timm Drevensek cb659e4c5a Merge branch 'master' into request/relative_submodules 
Conflicts:
	CHANGELOG
 2014-04-01 22:30:16 +02:00
Marin Jankovski 109ab1a58b Add comments, fix style, better names for notification methods. 2014-04-01 17:18:52 +02:00
Marin Jankovski 528a641e9e Use group notification settings while honoring project settings. 2014-04-01 17:18:52 +02:00
Marin Jankovski ce30a56f33 Add or remove watchers from list based on their notification settings. 2014-04-01 17:18:52 +02:00