Commit Graph
1645 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets cecfbd55de Restlye project sidebar a bit to make it more clear
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 19:38:53 +03:00
Dmitriy Zaporozhets 3b0cf49f33 Fix project description and avatar alignment
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 19:25:18 +03:00
Dmitriy Zaporozhets 30c6dbe36d Show CI link on project home page only if CI enabled
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 17:30:50 +03:00
Dmitriy Zaporozhets 040ee6f897 Reorganize elements in project sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 16:45:53 +03:00
Dmitriy Zaporozhets 7da7a790fa Move clone panel to sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 13:09:50 +03:00
Dmitriy Zaporozhets 4adac0b4be Remove unnecessary info from project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 11:49:49 +03:00
Dmitriy Zaporozhets 478a4b19da Turn sidebar in sections with contribute and repository
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 11:47:01 +03:00
Dmitriy Zaporozhets 3ce0557ab0 Move tabs with activity/readme to section
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 11:29:52 +03:00
Dmitriy Zaporozhets 31e5cd214e Move project section to own partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 11:26:27 +03:00
Dmitriy Zaporozhets 04e365ebb7 Move project sidebar to separate partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-05 11:23:25 +03:00
Douwe Maan 92fd3ccee0 Add helpers for header title and sidebar, and move setting those from controllers to layouts. 2015-05-01 10:39:16 +02:00
Douwe Maan ae09c2a6db Capitalize "X" in "New X". 2015-04-30 21:33:02 +02:00
Douwe Maan 0a63c1d2ab Have tree page title read "Files" for root. 2015-04-30 21:18:27 +02:00
Douwe Maan 6fcdd1504e Capitalize "Git Access" in page title. 2015-04-30 21:15:56 +02:00
Douwe Maan 9508bdc0c9 Include ref in network page title. 2015-04-30 21:14:26 +02:00
Douwe Maan f723968374 Include commit message in page title. 2015-04-30 21:12:31 +02:00
Douwe Maan 26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Dmitriy Zaporozhets 6d22e96744 Merge branch 'fix-submodule-error-with-forked-project' into 'master'
Fix "Revspec not found" errors when viewing diffs in a forked project with submodules

## What does this MR do?

This MR fixes an error that occurs when viewing diffs in a forked project with submodules.

### Are there points in the code the reviewer needs to double check?

Testing this code was tricky. The only way this problem shows up is if the origin project does NOT have the submodule update commit. The introduction of gitlab-test-fork serves that purpose: it contains a submodule update not present in gitlab-test.

### Why was this MR needed?

A user would receive a 500 error when trying to view a merge request with a submodule update. #1413 has details on how to reproduce this issue.

### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

#1413

See merge request !512
2015-04-30 16:47:35 +00:00
Dmitriy Zaporozhets 93359c7e06 Merge branch 'show-aside' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-show-aside 2015-04-30 19:40:05 +03:00
Douwe Maan 7e0eb486ed Don't allow a merge request to be merged when its title starts with "WIP". 2015-04-30 15:46:36 +02:00
Stan Hu 808b05e974 Move service template and project service settings into a shared view 2015-04-29 07:52:27 -07:00
Stan Hu 72a7febead Fix "Revspec not found" errors when viewing diffs in a forked project with submodules
Closes #1413
2015-04-27 20:42:38 -07:00
Dmitriy Zaporozhets 278c3ba401 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-27 11:38:36 +03:00
Sullivan SENECHAL f28f5e49f6 Fix wrong placement of show-aside link 2015-04-27 00:43:02 +02:00
Vinnie Okada bd557e4b64 Add new admin settings
Add new global application settings for default project and snippet
visibility levels.
2015-04-26 07:48:19 -06:00
Robert Speicher 96593d79f9 Add data-placement attributes for all sidebar links 2015-04-25 16:03:03 -04:00
Dmitriy Zaporozhets f912650ded Improve mobile UI for dashboard and project pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-24 17:39:53 +03:00
Douwe Maan 6ae606d81f Merge branch 'commit-project' into 'master'
Link cross-project cross-reference notes to correct project.

- Fixes #1431: Don't crash when an MR from a fork has a cross-reference comment from the target project on of its commits.
- Include commit comments in MR from a forked project.

To accomplish this, the Commit model needs to know about its project. Adding this attribute also simplifies a bunch of other methods that deal with a note's target, that previously had to have special logic for when it belonged to a commit.

See merge request !554
2015-04-24 12:46:39 +00:00
Dmitriy Zaporozhets 9409f2a3b3 Merge pull request #9065 from rumpelsepp/issues
Tweak issue page a bit
2015-04-24 15:01:27 +03:00
Douwe Maan 27af24c1c9 No longer needed to pass project argument to commit methods. 2015-04-24 12:29:36 +02:00
Douwe Maan 84a1590252 Let commit model know about its project. 2015-04-24 12:29:36 +02:00
Stefan Tatschner 4beb295b89 Tweak merge requests
* Include creation time
* Include author without avatar
* Move assignee to the right
* Include comments counter by default, gray it out when there are 0
  comments.
2015-04-24 09:36:50 +02:00
Stefan Tatschner dbd0fd20a9 Tweak issue page
* Include creation time
* Include author without avatar
* Move assignee to the right
* Remove action buttons. IMO they are useless and a bit annoying
* Include comments counter by default, gray it out when there are 0
  comments.
2015-04-24 09:36:42 +02:00
Douwe Maan a12d50c5e5 Remove unnecessary private_token params. 2015-04-23 17:11:39 +02:00
Douwe Maan cd450221eb Rename "News Feed" buttons to "Activity Feed" 2015-04-23 17:11:39 +02:00
Douwe Maan 059cc16430 Fix project atom link tag. 2015-04-23 17:11:39 +02:00
Douwe Maan 9c60354a6a Make links and titles of atom feeds consistent. 2015-04-23 17:11:39 +02:00
Douwe Maan a6dfd065ca Add atom feed for project activity. 2015-04-23 17:11:39 +02:00
Douwe Maan 72b090b890 Move activity feed buttons out of event_filter into actual show views. 2015-04-23 17:11:38 +02:00
Douwe Maan 8917ae39e3 Add atom link tag to every page that has one. 2015-04-23 17:11:38 +02:00
Ioannis Kappas 3196c52969 added fieldset support to project and admin services views.
split field logic to separate template.
2015-04-22 20:04:03 +03:00
Marin Jankovski 8d9c7305cd Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-22 11:17:09 +02:00
Dominik Sander 34b976fd27 Make issue preview look like the result 2015-04-21 22:16:53 +02:00
Robert Speicher 3ceb888d79 Fix tab behavior on MergeRequests#new 2015-04-21 15:19:06 -04:00
Dmitriy Zaporozhets a4006a6b48 Merge branch 'better-commit-mentions' into 'master'
Clean up code around commit mentions.

Builds upon !527.

See merge request !528
2015-04-20 12:42:31 +00:00
Ben Bodenmiller 47769bfd59 improve new project options
* Simplify new repo commands
* Include directions for how to add an existing folder that is either
already a repo or not yet a repo

Replaces #7918.
2015-04-20 03:13:39 -07:00
Dmitriy Zaporozhets d012648b49 Merge branch 'fix-label-color-input' into 'master'
Fix label color input.

Because `value` was set, every label color would render as purple in the form.

Introduced by 83b5a9ae2b between 7.9 and 7.10, so no changelog item.

See merge request !538
2015-04-20 08:30:05 +00:00
Robert Speicher 269aee790c Let Bootstrap's tab JS handle history
Closes #2219
2015-04-17 16:42:38 -04:00
Douwe Maan da89ebbe48 Fix label color input. 2015-04-17 17:38:31 +02:00
Dominik Sander d4fec49abc Fix merge request comments on files with multiple commits
Having a merge request with a comments on a line which is then changed
in a later commit prevented new comments from properly showing up in the
merge request show page.

 * `Note#set_diff` do not use stored the diff when creating a new note
   in merge requests (we can not be sure the diff did not changed since
   the last comment on that line)
 * Do not rely just on `outdated?` of the first note when displaying
   comments of a MR in the discussion tab, but partition the
   active/outdated notes and display them all
 * In the inline changes tab just select the active notes, so an
   outdated note does not prevent an active one from being rendered
 * Just show active comments in the side-by-side changes tab
2015-04-15 18:23:57 +02:00