home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,132 Commits 48 Branches 340 Tags
docker-updates
Commit Graph
1998 Commits
Author SHA1 Message Date
Stan Hu 0346e9724a Tweak remaining CSS for Markdown preview 
Missed a few items in !1378
 2015-09-21 14:08:26 -07:00
Dmitriy Zaporozhets cbdee053b4 Merge branch 'fix-ci-handling' into 'master' 
Fixed MR handling when GitLab CI project is not present

This is copy of !1371

/cc @jacobvosmaer @vsizov @dzaporozhets



See merge request !1373
 2015-09-21 18:29:29 +00:00
Robert Speicher cacc70daf4 Merge branch 'fix-note-edit-preview-css' into 'master' 
More tweaks to make note edit/preview CSS consistent

Closes #2585

See merge request !1378
 2015-09-21 18:18:55 +00:00
Stan Hu ef2fb20135 More tweaks to make note edit/preview CSS consistent 
Closes #2585
 2015-09-21 10:11:58 -07:00
Dmitriy Zaporozhets 39ed04c7b5 Merge branch 'repo-size-link' into 'master' 
Link project repo size to files



See merge request !1374
 2015-09-21 15:24:26 +00:00
Douwe Maan a9d686b2fb Link project repo size to files 2015-09-21 14:57:33 +02:00
Kamil Trzcinski ca6fd0a27d Fixed MR handling when GitLab CI project is not present 2015-09-21 14:55:02 +02:00
Douwe Maan 82edd68e55 Remove CI button from project home panel 2015-09-21 14:53:58 +02:00
Kamil Trzcinski abaa65efc1 Revert "Fixed MR handling when GitLab CI project is not present" 
This reverts commit 3abcab779e.
 2015-09-21 14:52:51 +02:00
Kamil Trzcinski 3abcab779e Fixed MR handling when GitLab CI project is not present 2015-09-21 13:53:03 +02:00
Douwe Maan 183892fde9 Merge branch 'notification-levels' into 'master' 
Notification levels can now be set on the Project's main page

![Screen_Shot_2015-09-16_at_7.49.49_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0ac517bdfdc801f0e2115463c3ea9e10/Screen_Shot_2015-09-16_at_7.49.49_PM.png)

The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level.

Saving is done via a remote form submission and if successful shows the user a flash message:

![Screen_Shot_2015-09-16_at_6.09.02_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8a6e1fde5177aa3976cadf59fdb8d375/Screen_Shot_2015-09-16_at_6.09.02_PM.png)

@DouweM can you please review my code. I gave my bestest effort to make in clean and readable.

@rspeicher hopefully we can include it with the 8.0 release, maybe?

/cc @darby 

See merge request !1322
 2015-09-21 09:19:32 +00:00
Douwe Maan 47e926bec0 Minor code cleanup 2015-09-20 19:09:43 +02:00
Douwe Maan 5faa6e75d0 Merge branch 'master' into project-header-titles 2015-09-18 10:48:06 +02:00
Stan Hu ac855e5ed3 Move partial locals out of controller 2015-09-17 07:24:45 -07:00
Douwe Maan d89ae7df2c Move project header title definition to view in question. 2015-09-17 12:16:24 +02:00
Patricio Cano 1ddefa3bea Merge branch 'master' into notification-levels 2015-09-16 19:54:18 -05:00
Patricio Cano 1ef2ce95d5 Merge branch 'master' into notification-levels 2015-09-16 19:52:57 -05:00
Patricio Cano 4c98357f16 Added Global to the drop downs and updated the label of the button to show the current level instead of Notifications 2015-09-16 19:46:24 -05:00
Dmitriy Zaporozhets f9dc3a2fb5 Add links from GitLab to CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-16 17:54:38 +02:00
Stan Hu d9af6f79ed Change the replace placeholder to use the filename 
Dynamically adjust placedholder for uploads and fix Dropzone event handlers

Override error handler to prevent error messages from being inserted underneath image preview

Fix tests

Use regexp instead of startsWith for better browser compatibility

Remove duplicate code in _replace.html.haml and use one template

Remove files upon error and retain alert messages until user adds a new file
 2015-09-15 13:07:32 -07:00
Robert SchillingandStan Hu 0a8ef29b3d Improve wording for header and placeholders 2015-09-15 13:07:32 -07:00
Dmitriy ZaporozhetsandStan Hu e14aa19e39 Cleanup some html/css for upload feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-15 13:07:32 -07:00
Dmitriy Zaporozhets d9d50c0598 Merge branch 'fix_empty_project' into 'master' 
Fix empty project UI

In an empty project, the 'project is empty' light well was mashed up against the project panel. The light well have 16px margin so there was some white space along the edges that looked funny. This MR makes the 'project is empty' text block a `gray-content-area` which fits nicely with the rest of the UI.

**Current:**

![Screen_Shot_2015-09-14_at_11.20.47_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/07b39641f602e01440dd5558a0d80237/Screen_Shot_2015-09-14_at_11.20.47_AM.png)

**As proposed:**

![Screen_Shot_2015-09-14_at_11.20.29_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/1c3b1d73584c68a88cd1b0fcf3d6ea5b/Screen_Shot_2015-09-14_at_11.20.29_AM.png)

See merge request !1291
 2015-09-15 16:07:22 +00:00
Dmitriy Zaporozhets dad9de660c Merge branch 'import-in-progress-fix' into 'master' 
Don't display "git clone --bare <URL>" if no URL is available

Make it clear that forking is different than importing. Forked repositories don't use `import_url`, so only display if is available. Introduced in !1231

Before:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/d8456334a2a9187b56a885f8849f229e/image.png)

After:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9823e8a2baf02859c4c3f05f3a5c35bf/image.png)

See merge request !1295
 2015-09-15 16:04:20 +00:00
Stan Hu 2abe733866 Display "Forking in Progress" when importing a forked project 2015-09-15 06:45:03 -07:00
Stan Hu 4d2b67acc0 Don't display "git clone --bare <URL>" if no URL is available 
Introduced in !1231
 2015-09-15 06:39:37 -07:00
Dmitriy Zaporozhets 3315e89df6 Merge branch 'ui-fixes' into 'master' 
Improve UI for last push widget and web editor

See merge request !1296
 2015-09-15 11:11:18 +00:00
Dmitriy Zaporozhets dacff8f014 Fix UI for web editor 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-15 11:17:22 +02:00
Dmitriy Zaporozhets a635e1a395 Fix last push widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-15 11:02:37 +02:00
Patricio Cano fa6df2228e Replaced this with @ in the coffee file and added an arrow that clearly marks the Notifications button as a drop down 2015-09-14 20:50:13 -05:00
Patricio Cano 01cc20378b Notification dropdown now shows currently active level, and also shows what the actual value of global is, if the project has the notification level set to global. 2015-09-14 20:33:24 -05:00
Stan Hu 81e741af24 Merge pull request #9138 from liyakun/master 
add "replace" and "upload" functionality
 2015-09-14 17:57:41 -07:00
Patricio Cano adcae6ebd5 Notification level can now be saved from within the project view. 2015-09-14 19:27:54 -05:00
liyakun e2ece2bc35 Add "Replace" and "Upload" features 
Refactor upload and replace functionality

    Rename file and move CSS

    Fix typo

    Make dropzone a div

    Remove unnecessary file

    Change color of "upload existing one"

    Add missing changes
 2015-09-15 02:12:56 +02:00
Darby 84508c40b7 PAtrially working notification button 2015-09-14 16:37:11 -07:00
Dmitriy Zaporozhets b5c681c0c9 Add current_ref helper method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-14 20:23:01 +02:00
Dmitriy Zaporozhets d3be65a811 Remove repeating titles on members and label pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-14 20:08:35 +02:00
Drew Blessing 789d06e48b Fix empty project UI 2015-09-14 11:20:18 -05:00
Dmitriy Zaporozhets 5fcfba2780 Merge branch 'dashboard-titles' into 'master' 
Clean up overlap between dashboard and explore

- Clean up overlap between dashboard and explore. ... 5d785457
  - Split up SnippetsController into separate dashboard and explore sections.
  - Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
- Consistently case `Back to X` links. 260fcd45
- Link to help from signin page bottom. d92696d3
- Make Help accessible for guests. c258e977

cc @dzaporozhets

See merge request !1260
 2015-09-11 14:36:56 +00:00
Douwe Maan a6997e339b Merge branch 'master' into dashboard-titles 2015-09-10 13:13:01 +01:00
Dmitriy Zaporozhets b08c5521f5 Style blob show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 13:25:09 +02:00
Dmitriy Zaporozhets df51b029ab Improve project fork page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 13:14:25 +02:00
Dmitriy Zaporozhets 86ef2eb728 Conver forked from button to text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 12:35:37 +02:00
Dmitriy Zaporozhets 10b6a92481 Style panels and add blank container 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-09 23:29:19 +02:00
Dmitriy Zaporozhets 0d610270d9 Merge branch 'ui-improvements' into 'master' 
Fix UI bugs with discussions

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1265
 2015-09-09 09:47:48 +00:00
Dmitriy Zaporozhets c9d78a00c5 Fix UI bugs with discussions 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-09 11:36:55 +02:00
Dmitriy Zaporozhets fbcde1aa77 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-09-09 09:20:48 +02:00
Jared Szechy e156f42079 FogBugz project import 2015-09-08 20:23:01 -04:00
Robert Speicher df1f4433c5 Merge branch 'mr-xss' into 'master' 
Escape user-provided content in preserved HAML sections

See merge request !1927
 2015-09-08 17:17:37 +00:00
Dmitriy Zaporozhets 86556a079e Improve diff UI and mr compare page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-08 17:22:26 +02:00