Commit Graph
90 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets ef4ca663fd Use standard button size for new file
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-28 11:34:29 +02:00
Arinde Eniola 367818d293 change the css class has_tooltip to has-tooltip universally 2016-03-20 21:37:22 +01:00
Robert Speicher d1f10c6666 Ensure link for README blobs includes the full path
Closes #13254
2016-02-09 17:56:15 -05:00
Rubén Dávila 7765ce1875 Setup new fork link in sidebar and routes. #2406 2016-01-20 00:14:58 -05:00
Dmitriy Zaporozhets 966c4f3392 Fix files, project settings and few more pages with new layout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-14 11:55:15 +01:00
Jacob Vosmaer 41b8a238ce Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-01-07 12:56:18 +01:00
Douwe Maan 1b9e2530de Merge branch 'master' into edit-on-fork
# Conflicts:
#	app/views/projects/tree/_tree_header.html.haml
2015-12-18 17:15:05 +01:00
Douwe Maan 0ac57a540d Satisfy Rubocop 2015-12-18 11:19:08 +01:00
Douwe Maan d9c82d679f Automatically fork a project when not allowed to edit a file. 2015-12-18 10:03:34 +01:00
Drew Blessing 50ef67617c Add branch and tag operation to tree dropdown 2015-12-17 14:50:00 -06:00
Douwe Maan f7ff146aaa Fix size of disabled 'New file' button 2015-12-09 13:52:13 +01:00
Robert Speicher e6668f8e34 Merge branch 'edit-in-patch-branch' into 'master'
Default target branch to patch-n when editing file in protected branch

Fixes #3441

See merge request !2021
2015-12-08 22:04:52 +00:00
Douwe Maan 57d71520bd Make tooltip less confusing 2015-12-08 22:30:40 +01:00
Douwe Maan 82ddd738b6 Show tooltip when trying to edit file when not on branch 2015-12-08 17:10:07 +01:00
Douwe Maan 7d3edf2520 Merge branch 'master' into ui/misc 2015-12-03 13:27:39 +01:00
Douwe Maan 6789bd25ef Make tree view "Add file" button smaller 2015-12-02 14:59:04 +01:00
Douwe Maan a3da3d8e3b Use monospace font for commit SHA in branch list 2015-12-02 14:55:29 +01:00
Douwe Maan e945ec0280 Add "Start a new merge request" option to every commit form 2015-11-17 18:53:56 +01:00
Douwe Maan 0f2b10c69f Fix duplication between tree_header and tree_content 2015-10-21 08:41:53 +02:00
Douwe Maan 7ae139566b Merge branch 'master' into full-width-tables 2015-10-19 11:34:48 +02:00
Douwe Maan a32f776609 Make tables full width. 2015-10-19 11:19:45 +02:00
Douwe Maan a22fe254c1 Use same style for project readme, tree readme and regular blob. 2015-10-17 19:17:47 +02:00
Douwe Maan 7b26414c15 Split up projects/tree/_tree partial. 2015-10-17 19:17:13 +02:00
Douwe Maan 70240f433c Merge branch 'master' into cristianbica/gitlab-ce-user-project-view-files 2015-10-17 18:20:04 +02:00
Dmitriy Zaporozhets a0a488ed13 Apply new design to files page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-13 16:41:48 +02:00
Stan Hu 0ab6ca93aa Add directory feature button
Change "+" icon under "Files" section to have three options:

* Create file
* Upload file
* New directory

Upload file is no longer accessible from the "Create file" page.
Users can now select a target branch in upload file as well.

Closes #2799: Fixes a bug where file modes were overwritten after a commit

Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files
can no longer be overwritten in the "Create file" section.

Closes #2557
2015-10-07 04:22:55 -07:00
Cristian Bica c528043439 Allow users to select the Files view as default project view 2015-10-01 17:05:20 +03:00
Douwe Maan d89ae7df2c Move project header title definition to view in question. 2015-09-17 12:16:24 +02:00
Dmitriy Zaporozhets aa6d29f0a7 Style commits, branches and tags pages to match new UI 2015-09-07 11:44:00 +02:00
Sven Strickroth 1567914f7c Drop the user name from tree row to improve readability of commit messages
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2015-08-09 14:40:16 +02:00
Dmitriy Zaporozhets 1c3c232608 Revert "Put author name at the end of a tree row"
This reverts commit ee0fc2c3ad.
2015-08-07 18:12:15 +02:00
Sven Strickroth ee0fc2c3ad Put author name at the end of a tree row
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2015-08-05 00:12:13 +02:00
Stan Hu 562242cb9d Fix commit data retrieval when branch name has single quotes
Closes #1724
2015-07-26 03:47:01 -07:00
Dmitriy Zaporozhets f0e1da04f0 Show last push widget on several project pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 23:21:35 +02:00
Douwe Maan e9dff9f410 Fix alignment of ref picker, breadcrumb and buttons. 2015-05-12 10:27:17 +02:00
Douwe Maan 0a63c1d2ab Have tree page title read "Files" for root. 2015-04-30 21:18:27 +02:00
Douwe Maan 26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Douwe Maan 9c60354a6a Make links and titles of atom feeds consistent. 2015-04-23 17:11:39 +02:00
Douwe Maan 8917ae39e3 Add atom link tag to every page that has one. 2015-04-23 17:11:38 +02:00
Sullivan SENECHAL 8ef7220c23 Improve file icons rendering on tree 2015-03-28 16:49:05 +01:00
Dmitriy Zaporozhets 30ca451fd4 Refactor buttons 2015-03-14 00:29:32 -07:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
Dmitriy Zaporozhets 752cb506c0 Refactor blob views 2015-01-26 15:03:30 -08:00
Headless 3d2aaa169e show diff in submodules 2015-01-19 17:18:08 +03:00
Dmitriy Zaporozhets 11591573e1 Merge pull request #7925 from cirosantilli/unused-arguments
Remove or prepend underscore _ to unused method arguments
2015-01-15 14:42:03 -08:00
marmis85 021cff67f3 Flatten the directory hierarchy while there is only one directory descendant 2014-12-31 03:15:04 +01:00
Ciro Santilli 6c65b91d8c Remove or prepend _ to unused method arguments 2014-12-27 22:38:25 +01:00
Dmitriy Zaporozhets 0189be0831 Use short_id instead of [0..N] for short version of commit sha
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 15:39:48 +03:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Ciro Santilli 0d4ae0e392 Titleize blob action buttons. 2014-09-30 23:32:03 +02:00