home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,591 Commits 48 Branches 340 Tags
cdec9e472db581acbee72cdcaa703e4155cb4cfb
Commit Graph
14879 Commits
Author SHA1 Message Date
Kamil Trzcinski cdec9e472d Replace \n to <br> 2016-05-23 21:59:07 -05:00
Kamil Trzcinski 46de0366b1 Fix concurrent request when updating build log in browser 2016-05-23 20:57:03 -05:00
Dmitriy Zaporozhets 510b5c5f39 Move files tab before commits tab to follow same order as top navigation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-24 00:41:31 +02:00
Dmitriy Zaporozhets f34a9f17ba Fix badge count UI for pipelines menu item 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-24 00:41:07 +02:00
Dmitriy Zaporozhets 3d4ef74d36 Use start_with? instead of regex 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-24 00:23:23 +02:00
Dmitriy Zaporozhets 2f4dc1ee16 Merge branch 'master' into project-navigation-redesign 2016-05-23 22:41:11 +02:00
Robert Speicher 18ac02a3fe Merge branch 'rs-space-around-keyword' into 'master' 
Enable Style/SpaceAroundKeyword cop and fix offenses

Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17478

See merge request !4259
 2016-05-23 19:29:25 +00:00
Robert Speicher 165834b373 Merge branch 'complexity/rubocop-style-loop' into 'master' 
Enable Style/InfiniteLoop Rubocop cop

This MR enabled Style/InfiniteLoop Rubocop cop, and fixes offenses.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/17478

See merge request !4257
 2016-05-23 18:47:05 +00:00
Robert Speicher 3ba72f69af Enable Style/SpaceAroundKeyword cop and fix offenses 2016-05-23 14:16:35 -04:00
Robert Speicher d3fd58570c Merge branch 'rs-start-with' into 'master' 
Enable Performance/StartWith cop and fix offenses

Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17478

See merge request !4256
 2016-05-23 18:13:08 +00:00
Annabel Dunstone 75532a6570 Change rgba to hex; use sass variables to calculate header height 2016-05-23 12:54:04 -05:00
Grzegorz Bizon 17eaecd6c7 Enable Style/InfiniteLoop Rubocop cop 2016-05-23 19:50:31 +02:00
Robert Speicher 2de1109da3 Enable Performance/StartWith cop and fix offenses 2016-05-23 13:21:02 -04:00
Annabel Dunstone e8f869f96b Revert commit info change 2016-05-23 12:04:55 -05:00
Annabel Dunstone 27a5a4e430 Put column headers back 2016-05-23 09:46:06 -05:00
Annabel Dunstone 9c1b3d88db Move build info out of pipeline conditional 2016-05-23 09:30:54 -05:00
Annabel Dunstone 85031223cd Move tags into column 2016-05-23 08:47:25 -05:00
Phil Hughes d3bdbf55c7 Fixed issue with dropdown not opening after removing due date 2016-05-23 09:33:48 +01:00
Phil Hughes a69ab104de Added remove due date button 
In the sidebar when there is a due date, a link to remove due date becomes visible

Closes #17392
 2016-05-23 08:40:04 +01:00
Grzegorz BizonandStan Hu a006ff74c7 Serialize application setting as Array by default 2016-05-22 22:31:28 -07:00
Kamil TrzcinskiandGrzegorz Bizon cd26cfbc27 Allow anonymous user to access pipelines 2016-05-23 01:31:51 +02:00
Kamil TrzcinskiandGrzegorz Bizon 646018a40e Fix the CI login to Container Registry (the gitlab-ci-token user) 2016-05-23 00:34:51 +02:00
Yorick Peterse 5a02f28a1b Merge branch 'fix-docker-registry-integration' into 'master' 
Fix docker registry integration

See merge request !4229
 2016-05-21 22:57:39 +00:00
Tony Chu ad13d357e7 fix user.name length in milestones participants tab 2016-05-21 13:52:38 +08:00
Jacob Schatz aa060e68ee Merge branch 'dz-fix-fork-counter' into 'master' 
Fix fork counter ui bug for safari

## What does this MR do?

Fixes UI bug on safari when fork button has blue arrow

## Screenshots 

![Screenshot_2016-05-19_22.10.21](/uploads/d923d8fc6bc12ee8f7052390bd5d7c51/Screenshot_2016-05-19_22.10.21.png)![Screenshot_2016-05-19_22.09.38](/uploads/130eb8b4a09b2ba5b7c5a83fed543dbf/Screenshot_2016-05-19_22.09.38.png)

See merge request !4221
 2016-05-21 03:36:36 +00:00
Jacob Schatz 73403c4ca7 Merge branch 'issuable-new-due-date' into 'master' 
Issuable form due date

For some reason, this was never in the original merge request for due date?

![Screen_Shot_2016-04-22_at_21.49.44](/uploads/7d4e2b07f75a33009e3170fdb076a4bd/Screen_Shot_2016-04-22_at_21.49.44.png)

Closes #15516

See merge request !3895
 2016-05-21 03:34:43 +00:00
Jacob Schatz 98b1daf32d Merge branch 'dropdown-enter-select' into 'master' 
Fixed issue with enter key selecting wrong option in dropdown

If you search for a label and press enter the dropdown will select the last element rather than the first. This is because the currentIndex is -1 rather than 0

![labels](/uploads/eb29924109947fd63fea32e21471f05a/labels.gif)

Closes #17630

See merge request !4210
 2016-05-21 00:11:18 +00:00
Jacob Schatz 9aab0f0973 Merge branch 'merge-immediately-button-color-fix' into 'master' 
Fixed issue with merge button color

![Screen_Shot_2016-05-19_at_12.51.35](/uploads/a2768908553961e88c5a8f0e1f343078/Screen_Shot_2016-05-19_at_12.51.35.png)

Closes #17644

See merge request !4211
 2016-05-21 00:08:23 +00:00
Jacob Schatz 535252005e Merge branch 'fix/style-empty-groups' into 'master' 
Wrap "No groups found" message with a .nothing-here-block

The "No groups found" message's style is inconsistent with the other empty messages.

## Screenshots

### Empty groups
![Screen_Shot_2016-05-13_at_13.40.34](/uploads/1447c5f60cde7d50d6f8f07c41704e5c/Screen_Shot_2016-05-13_at_13.40.34.png)

### Empty projects
![Screen_Shot_2016-05-13_at_13.40.30](/uploads/c21ff093f3d6bdbafecf7b075fa33d3c/Screen_Shot_2016-05-13_at_13.40.30.png)

See merge request !4137
 2016-05-21 00:07:08 +00:00
Kamil Trzcinski 4474eab4f6 Fix container deletion permission issue 2016-05-20 18:43:11 -05:00
Douwe Maan ec86644545 Merge branch 'zj-gitignore-dropdown' 2016-05-20 17:14:22 -05:00
Douwe Maan baccd1838c Merge branch 'rm-source-branch' into 'master' 
Allows MR authors to have the source branch removed when merging the MR


closes #13191 

The location of the checkbox might not be optimal so any feedback is welcome. Any other feedback too obviously.

Screenshot:
![Screenshot_2016-02-17_21.25.24](/uploads/a9c3eaafb39c6f5b4f0949a2278af6da/Screenshot_2016-02-17_21.25.24.png)

See merge request !2801
 2016-05-20 21:41:02 +00:00
Douwe Maan fc1910ddc5 Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename' 
# Conflicts:
#	app/services/system_note_service.rb
 2016-05-20 16:23:04 -05:00
Douwe Maan 63f53730c0 Merge branch 'issue_14684_2' into 'master' 
current_user.confirmed_at.present? => current_user.confirmed?

fixes: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3862/diffs#4f7b76b1197d6fb073f77957b3b7b70d921ed7e7_42_41

See merge request !4225
 2016-05-20 21:09:49 +00:00
Douwe Maan ba5b47c2e3 Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master' 
Implement special GitLab markdown reference for milestones

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3453 by @eReGeBe, with two additions:

- Move changelog item to 8.8
- Fix cross-project milestone ref with invalid project, like https://gitlab.com/gitlab-org/gitlab-ce/commit/f7348cd348ad8f4a18d74dd668283a4e236f5790 did for labels

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13829

See merge request !3897
 2016-05-20 21:08:57 +00:00
Douwe Maan a97cb8f8b8 Merge branch 'issue_9013' into 'master' 
Let users set notification levels in projects which they are not members

Fixes #9013 

See merge request !3986
 2016-05-20 21:04:55 +00:00
Alfredo Sumaran ab96ca2bf1 Dropdown implementation 2016-05-20 15:58:36 -05:00
Alfredo Sumaran 1f5fcb638d Dropdown implementation 2016-05-20 15:58:36 -05:00
Zeger-Jan van de WegandAlfredo Sumaran fab9dbb3eb First import of gitignores 
Add .gitignore dropdown when creating a new .gitignore file

Signed-off-by: Alfredo Sumaran <alfredo@gitlab.com>
 2016-05-20 15:58:36 -05:00
Zeger-Jan van de WegandAlfredo Sumaran e166a8022a Backend for a gitignores dropdown 2016-05-20 15:58:36 -05:00
Douwe Maan 56eb42007a Merge branch 'issue-17537-fix' into 'master' 
Fix Error 500 when attempting to retrieve project license when HEAD points to non-existent ref

Closes #17537

See merge request !4151
 2016-05-20 20:46:06 +00:00
Douwe Maan f9cf65a6c4 Merge branch 'rs-issue-3055' into 'master' 
Use extended regexp flag for `git grep`-ing files

Closes #3055

See merge request !4203
 2016-05-20 19:56:23 +00:00
Felipe Artur f04c5b27f0 current_user.confirmed_at.present? => current_user.confirmed? 2016-05-20 13:52:42 -04:00
James Lopez 341c1181d9 refactor project to include some nicer EE stuff 2016-05-20 14:55:27 +02:00
Jeroen Jacobs 7880a300dc Allows MR authors to have the source branch removed when merging the MR 2016-05-20 11:30:03 +02:00
Phil Hughes f307ff3413 Replaced line breaks 2016-05-20 09:11:28 +01:00
Phil Hughes 9f60a2eda2 Fixed issue with enter key selecting wrong option in dropdown 
If you search for a label and press enter the dropdown will select the last element rather than the first. This is because the currentIndex is -1 rather than 0

Closes #17630
 2016-05-20 08:50:42 +01:00
Phil Hughes ce8dd3bd66 Fixed issue with merge button color 
Closes #17644
 2016-05-20 08:50:09 +01:00
Dmitriy Zaporozhets a768c04ba5 Fix fork counter ui bug for safari 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-19 22:09:51 -05:00
Felipe Artur 6fb9bf87c4 Use the right default notification settings for non members 2016-05-19 19:47:07 -04:00