home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 11:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,752 Commits 48 Branches 340 Tags
4a514b27e96bfa6024e26b0a7500deec1d89391b
Commit Graph
26752 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémy Coutable 4a514b27e9 Merge branch 'issue_15155' into 'master' 
Setup visibility level for project when transfering for a group

fixes #15155 

See merge request !3707
 2016-04-14 15:13:08 +00:00
Robert Speicher 39f6cfcc3e Merge branch 'rake-db-reset' into 'master' 
Use rake db:reset instead of db:setup

See merge request !3721
 2016-04-14 15:07:58 +00:00
Felipe Artur a8ea2c1895 Change transfer service to use existing methods 2016-04-14 11:34:42 -03:00
Yorick Peterse a54af831ba Use rake db:reset instead of db:setup 
Using db:reset ensures existing tables are first dropped. This in turn
ensures that we can drop tables regardless of any foreign key
constraints. While CE currently doesn't have any foreign keys EE defines
the following relation:

    remote_mirrors.project_id -> projects.id

MySQL will complain whenever you try to drop the "projects" table first
even when using "DROP TABLE ... CASCADE".
 2016-04-14 15:53:54 +02:00
Rémy Coutable 64776ab2b4 Merge branch 'start-with-iid-on-new-branch' into 'master' 
Start with iid on branch creation

After the discussion it in #3886 it was decided the iid should be in the beginning of the branch name.

See merge request !3708
 2016-04-14 13:41:30 +00:00
Achilleas Pipinellis e1acd361af Merge branch 'master' into 'master' 
Update shibboleth configuration for GitLab 8.6 and Apache 2.4



See merge request !3713
 2016-04-14 13:22:27 +00:00
Zeger-Jan van de Weg 0385cd5a58 Start with iid on branch creation 2016-04-14 14:49:45 +02:00
Achilleas Pipinellis 253615f430 Merge branch 'toc_gitlab_ci_yml' into 'master' 
Add TOC to yaml README and an intro section



See merge request !3719
 2016-04-14 12:42:13 +00:00
Achilleas Pipinellis 072b9c2c8f Add TOC to yaml README and an intro section 
[ci skip]
 2016-04-14 15:40:05 +03:00
Phil Hughes badb353350 Added CHANGELOG item 2016-04-14 11:29:19 +01:00
Phil Hughes fd9c3b7c74 Fixed issue with other links being clicked in diffs 2016-04-14 11:29:19 +01:00
Phil Hughes f3ed4763f5 Correctly scrolls to the line when clicking 2016-04-14 11:29:19 +01:00
Phil Hughes 8a8d4c9bf2 Diff viewer links to correct part of the file 
Added highlight colours to diff rows

Closes #13852
 2016-04-14 11:29:19 +01:00
Rémy Coutable c71cdb194f Merge branch 'simplify-gitlab-url_builder-15202' into 'master' 
Refactor and expose only Gitlab::UrlBuilder.build(record)

```
$ git grep Gitlab::UrlBuilder

app/models/commit.rb:      url: Gitlab::UrlBuilder.build(self),
app/services/issues/base_service.rb:      issue_url = Gitlab::UrlBuilder.build(issue)
app/services/merge_requests/base_service.rb:      hook_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(merge_request)
app/views/search/results/_note.html.haml:- note_url = Gitlab::UrlBuilder.build(note)
lib/gitlab/note_data_builder.rb:        base_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(note)
spec/lib/gitlab/note_data_builder_spec.rb:    expect(data[:object_attributes][:url]).to eq(Gitlab::UrlBuilder.build(note))
spec/lib/gitlab/url_builder_spec.rb:describe Gitlab::UrlBuilder, lib: true do
```

Fixes #15202.

See merge request !3696
 2016-04-14 10:27:49 +00:00
Jacob Schatz 595aba54af Merge branch 'note-form-buttons' into 'master' 
Note form

A lot of the forms have the same actions associated with them so I have created a standard class that encapsulate these actions.

There is also another class that allows toolbar action buttons to be added that will insert different characters based on the HTML `data-prefix` attribute value - this will give us the opportunity to add more actions to the form and maybe create a markdown toolbar in the future.

See merge request !3534
 2016-04-14 10:18:50 +00:00
Phil Hughes 0d8462b897 Fixed scss syntax issue 2016-04-14 10:28:05 +01:00
Phil Hughes ca01103ded Focus variable for dropzone 2016-04-14 10:28:05 +01:00
Phil Hughes 8ffb02d9f8 Added CHANGELOG item 2016-04-14 10:28:05 +01:00
Phil Hughes c5d7b467ab Updated dropzone hover styling 2016-04-14 10:28:05 +01:00
Phil Hughes 094cafcaa7 Removed GL Actions class 2016-04-14 10:28:05 +01:00
Phil Hughes 7a1800fec8 Fixed group milestones placeholder bug 2016-04-14 10:28:05 +01:00
Phil Hughes 6e93bd56f0 Placeholder on milestone form 
Updated JS spec to include gl_form
 2016-04-14 10:28:05 +01:00
Phil Hughes 3de09d1475 Updated all GFM forms to use new GLForm class 2016-04-14 10:28:05 +01:00
Phil Hughes d67c3e35c9 Milestones use new GLForm class 2016-04-14 10:28:05 +01:00
Phil Hughes c45ca936c7 merge request form uses new GLForm 2016-04-14 10:28:05 +01:00
Phil Hughes ff7fb09ea8 Updated issue form to use new GLForm 2016-04-14 10:28:05 +01:00
Phil Hughes 5dd01f572c Destroy discussion form 2016-04-14 10:28:05 +01:00
Phil Hughes 82164a9f77 Notes form JS update 
Updated the JS to have a standard class with standard actions for each form
Created ability to have toolbar buttons that insert different prefixes dependant upon the data-prefix attribute
 2016-04-14 10:28:05 +01:00
Rémy Coutable 8ee04ebe29 Merge branch 'patch-1' into 'master' 
Do not require recipients when pusher will be recipient

Closes #10946

See merge request !3603
 2016-04-14 09:17:22 +00:00
Frank Groeneveld 2fd05aed46 Allow empty recipient list when pusher is added 
Closes #13574
 2016-04-14 10:24:09 +02:00
Rémy Coutable a872a29ebd Merge branch 'api-issue-update-and-note-create-backdating-14947' into 'master' 
API issue update and note create back dating

Closes #14947 

See merge request !3551
 2016-04-14 07:51:57 +00:00
Tom Downes 8978921323 Update shibboleth configuration for GitLab 8.6 and Apache 2.4 2016-04-14 01:03:50 +00:00
Jacob Schatz 091c77e3c5 Merge branch 'issue_15222' into 'master' 
Add test for search page

Closes #15222

See merge request !3711
 2016-04-13 22:39:28 +00:00
Alfredo Sumaran a31c1dccb6 Add test to check if top right search form is not present 2016-04-13 16:43:07 -05:00
Valery Sizov c0678f2d28 Merge branch 'redis_config_consistency' into 'master' 
Redis configuration consistency

Related https://gitlab.com/gitlab-org/gitlab-ce/commit/cf669551f69edd66913d22c96cf1de1302e7990e

See merge request !3697
 2016-04-13 18:34:11 +00:00
Felipe Artur 6b3a53848c Add changelog entry 2016-04-13 15:30:50 -03:00
Felipe Artur 11f46b459e Setup visibility level for project when transfering for a group 2016-04-13 15:28:10 -03:00
Valery Sizov 2244aaf98f Redis configuration consistency 2016-04-13 20:57:19 +03:00
Jacob Schatz 31d9f65553 Merge branch 'issue_14771' into 'master' 
Hide top search form on the search page

Closes #14771

![Screen_Shot_2016-04-11_at_6.04.19_PM](/uploads/44cf2110bad29c0df06d874740a3a61f/Screen_Shot_2016-04-11_at_6.04.19_PM.png)

See merge request !3668
 2016-04-13 17:28:14 +00:00
Jacob Schatz d7c7f54634 Merge branch 'issue_15093' into 'master' 
Set tooltips for new added labels

Fixes #15093 

![Screen_Shot_2016-04-11_at_5.50.21_PM](/uploads/52d06f6ccb3ca42e7ce75b94111514c2/Screen_Shot_2016-04-11_at_5.50.21_PM.png)

See merge request !3667
 2016-04-13 17:19:20 +00:00
Jacob Schatz 9c9893dd6d Merge branch '14762-delete-button' into 'master' 
Update delete button

Closes #14762 

![Screen_Shot_2016-04-11_at_5.21.32_PM](/uploads/fef09645eb70fc0fcaee359245664ddc/Screen_Shot_2016-04-11_at_5.21.32_PM.png)

See merge request !3665
 2016-04-13 17:16:30 +00:00
Michael Greene c1467f5d97 Allow back dating notes on creation 2016-04-13 12:04:09 -05:00
Michael Greene 28a7fe25fd Allow back dating issues on update 2016-04-13 12:04:09 -05:00
Jacob Schatz e17f79fdfa Merge branch 'issuable-form-alignment' into 'master' 
Fixed alignment on issuable new form

Fixes #13802

![Screen_Shot_2016-04-11_at_17.03.29](/uploads/d359580e693284d4b694d8158d4f736e/Screen_Shot_2016-04-11_at_17.03.29.png)

See merge request !3661
 2016-04-13 16:24:48 +00:00
Achilleas Pipinellis 59bfc0fb59 Merge branch 'update-influx-documentation' into 'master' 
Updated InfluxDB/Grafana setup/import docs

See https://gitlab.com/gitlab-org/grafana-dashboards/merge_requests/1 for some background info.

cc @dblessing 

See merge request !3706
 2016-04-13 16:23:50 +00:00
Robert Speicher 2b28fa14b3 Merge branch 'redis_improvements' into 'master' 
Clean up ExclusiveLease

See merge request !3695
 2016-04-13 16:22:45 +00:00
Robert Speicher 0b447a9977 Merge branch 'fix-trailing-slash-in-bamboo_url' into 'master' 
Fix a bug with trailing slash in bamboo_url

Also, improve specs for BambooService

Similar to !3679.

See merge request !3680
 2016-04-13 16:18:46 +00:00
Robert Speicher 6020602359 Merge branch 'fix-trailing-slash-in-teamcity_url-3515' into 'master' 
Fix trailing slash in teamcity_url

Originally opened at !2309 by @ctmay4.

As described in #3515, if you have trailing spaces in the the Teamcity server name, the service
will not work properly.  Switching from `URI.parse` to `URI.join` fixes it so that it works with
or without a trailing slash.

Fixes #3515.

See merge request !3679
 2016-04-13 16:17:39 +00:00
Rémy Coutable c414e4342b Merge branch 'async-related-mrs' into 'master' 
Load related MRs/branches asynchronously

cc @dzaporozhets 

See merge request !3678
 2016-04-13 16:06:36 +00:00
Jacob Schatz 0e7968d0a1 Merge branch 'make_milestone_labels_tab_similar_to_labels_page' into 'master' 
Make milestone labels in labels tab similar to that of the labels page

I realized that some of the changes for the labels page was not reflecting in the labels list in milestone page.

## Desktop
![Screen_Shot_2016-04-11_at_4.25.36_PM](/uploads/e21f3c5a9187fe32472e796171781b5d/Screen_Shot_2016-04-11_at_4.25.36_PM.png)

## Mobile
![Screen_Shot_2016-04-11_at_4.26.47_PM](/uploads/5c9f75ca0938fc30ab47c5520215f692/Screen_Shot_2016-04-11_at_4.26.47_PM.png)


See merge request !3658
 2016-04-13 16:02:20 +00:00