Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
AgeCommit message (Collapse)Author
2015-09-17Merge branch 'remove-ci-help' into 'master'Kamil Trzciński
Remove CI help Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/2556 See merge request !1325
2015-09-17Remove CI helpKamil Trzcinski
2015-09-17Move partial locals out of controllerStan Hu
2015-09-17Fix nav_link for dashboardKamil Trzcinski
2015-09-17Integrate CI navigation more tightly with projectKamil Trzcinski
2015-09-17Merge branch 'fix-issue-2382' into 'master'Stan Hu
Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c89cc8a0a9fa549deac433f17b890913/image.png) Closes #2382 See merge request !1227
2015-09-17Merge branch 'fix-ci-500-on-settings' into 'master'Dmitriy Zaporozhets
Fix 500 on CI project settings Fix: https://gitlab.com/gitlab-org/gitlab-ce/issues/2546 /cc @dzaporozhets See merge request !1321
2015-09-17Merge branch 'fix-public-projects' into 'master'Dmitriy Zaporozhets
Fix displaying public projects Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/2552 See merge request !1318
2015-09-17Fix HTML link that was improperly escaped in new user e-mailStan Hu
Closes https://github.com/gitlabhq/gitlabhq/issues/9640
2015-09-16Fix 500 on CI project settingsKamil Trzcinski
2015-09-16Fix displaying public projectsKamil Trzcinski
2015-09-16Merge branch 'fix-ci-nav' into 'master'Dmitriy Zaporozhets
Fix confusing behaviour of back link in CI sidebar Back link should always be responsible for sidebar navigation below. It should change sidebar navigation to one level up See merge request !1316
2015-09-16Fix confusing behaviour of back link in CI sidebarDmitriy Zaporozhets
Back link should always be responsible for sidebar navigation below. It should change sidebar navigation to one level up
2015-09-16Style CI projects page and builds listDmitriy Zaporozhets
2015-09-16Merge branch 'add-links-to-ci' into 'master'Dmitriy Zaporozhets
Add links from GitLab to CI * link from dashboard to CI dashboard * link from project to CI project Its a fast solution for 8.0. Might be improved in later versions Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1313
2015-09-16Add links from GitLab to CIDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-16Fix projects editKamil Trzcinski
2015-09-16Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski
ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-09-15Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski
ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock
2015-09-15Fix: features/ci/admin/runners_spec.rbKamil Trzcinski
2015-09-15Change the replace placeholder to use the filenameStan Hu
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-15Improve wording for header and placeholdersRobert Schilling
2015-09-15Cleanup some html/css for upload featureDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-15Merge branch 'fix_empty_project' into 'master'Dmitriy Zaporozhets
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-15Merge branch 'import-in-progress-fix' into 'master'Dmitriy Zaporozhets
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-15Display "Forking in Progress" when importing a forked projectStan Hu
2015-09-15Don't display "git clone --bare <URL>" if no URL is availableStan Hu
Introduced in !1231
2015-09-15Create a "destroyed Milestone" event and keep Milestone events around in the DBStan Hu
for posterity. Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Add "in" preposition when creating and destroying milestones Closes #2382
2015-09-15Merge branch 'ui-fixes' into 'master'Dmitriy Zaporozhets
Improve UI for last push widget and web editor See merge request !1296
2015-09-15Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets
2015-09-15Fix UI for web editorDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-15Fix last push widgetDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-15Improve project settings button on profileDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-15Merge pull request #9138 from liyakun/masterStan Hu
add "replace" and "upload" functionality
2015-09-15 Add "Replace" and "Upload" featuresliyakun
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-14Make small ui fixes for CIDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-14Add current_ref helper methodDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-14Remove repeating titles on members and label pagesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-14Add page titles to header for group and projectDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-14Fix empty project UIDrew Blessing
2015-09-14Merge branch 'public_profiles' into 'master'Dmitriy Zaporozhets
Make all group public https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1219# Internal issue - https://dev.gitlab.org/gitlab/gitlabhq/issues/1361 See merge request !1247
2015-09-14Hide search panel for group page if you dont have accessDmitriy Zaporozhets
2015-09-14Fix tests and improve wordingDmitriy Zaporozhets
2015-09-14Fix navigation and header tileKamil Trzcinski
Remove redundant navigation on commits and builds page
2015-09-14Make commits to hover when going to commits and buildsKamil Trzcinski
2015-09-14Fix h3 page titles for triggers, variables and web hooksKamil Trzcinski
2015-09-14Remove duplicate noticesKamil Trzcinski
2015-09-14Fix navigationKamil Trzcinski
2015-09-14Remove unused user_sessionsKamil Trzcinski
2015-09-14Hide group sidebar menu if user cant access itDmitriy Zaporozhets