Commit Graph
54 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets ca7e31c48f Merge branch 'ui/consistency' into 'master'
UI: Improve consistency across the board

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2577

See merge request !1954
2015-12-02 22:17:48 +00:00
Douwe Maan 854deae412 Brefer "Directory" over "Dir", "Files" over "Code 2015-12-02 14:56:17 +01:00
Douwe Maan 1c595681e5 Remove double border between gray blocks 2015-12-02 14:49:29 +01:00
Douwe Maan 3ad1d320ef Remove duplicated styling for center top menus 2015-12-02 14:49:12 +01:00
Douwe Maan e49190cad9 Don't use params[:view] directly. 2015-11-17 16:33:38 +01:00
Jason Lee 18cb430f79 Replace CoffeeScript block into JavaScript in Views.
For example view: shared/issuable/_context

CoffeeScript: 190ms
JavaScript: 19.7ms
2015-11-10 19:17:37 +08:00
Kamil Trzcinski 2becd53015 Add missing stage to builds view 2015-11-05 15:24:27 +01:00
Kamil Trzcinski ba68facf8d CI details cleanup
- Add page titles to CI settings.
- Fix CI admin navigation.
- Remove duplicated scope.
- Use monospace font for commit sha.
- Add page title and header title to build page.
- Proper authorization for cancel/retry builds.
- Use gitlab pagination theme for builds and group members.
- Don't paginate builds widget on build page.
- Add badges to commit page Changes/Builds tabs.
- Add "Builds" to commit Builds tab page title.
- Add and use Ci::Build#retryable? method.
- Add CI::Build#retried? method.
- Allow all failed commit builds to be retried.
- Proper authorization for cancel/retry all builds.
- Remove unused param.
- Use time_ago_with_tooltip where appropriate.
- Tweak builds index text
- Remove duplication between builds/build and commit_statuses/commit_status.
- Use POST rather than GET for canceling and retrying builds.
- Remove redundant URL helpers.
- Add build ID to build page.
- Link branch name on build page.
- Move commit/:sha/ci to commit/:sha/builds.
2015-11-05 15:24:27 +01:00
Douwe Maan a32f776609 Make tables full width. 2015-10-19 11:19:45 +02:00
Kamil Trzcinski 33c9d6e45c Fix retry and cancel for build 2015-10-14 12:56:52 +02:00
Kamil Trzcinski 4bf69b0bd9 Fix feature tests 2015-10-12 23:59:21 +02:00
Kamil Trzcinski 789fe7b489 Update rendering 2015-10-12 16:32:58 +02:00
Kamil Trzcinski 914cfbd2f1 Implement Commit Status API 2015-10-12 11:53:49 +02:00
Dmitriy Zaporozhets 1e06cabf4a Remove Ci::Commit and Ci::Build controllers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-07 15:24:32 +02:00
Dmitriy Zaporozhets f6223ffb31 Move CI build page to CE project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-06 19:34:21 +02:00
Dmitriy Zaporozhets 697b34d786 Render CI statuses on commit page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-06 16:10:17 +02:00
Dmitriy Zaporozhets 9c4307e287 Show CI status on commit page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-24 11:21:39 +02:00
Douwe Maan d89ae7df2c Move project header title definition to view in question. 2015-09-17 12:16:24 +02:00
Dmitriy Zaporozhets 70aecc34cf Improve commit page style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-08 15:40:14 +02:00
Stan Hu a7932fe2fd Support commenting on a diff in side-by-side view
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
2015-06-16 06:11:59 -07: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 5f3a758721 Merge branch 'fix-plain-diffs' into 'master'
Remove the email patches link for merge commits

Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download them as email patches.  This is part of the fix for #1878, and gitlab/gitlab_git!27 allows a plain diff to be generated for a merge commit.  Together these changes should prevent the 500 errors described in the issue.

cc @sytse

See merge request !1737
2015-03-29 10:32:27 +00:00
Dmitriy Zaporozhets 8b7aedad2b Prevent doubling AJAX request with each commit visit via Turbolink 2015-03-25 15:47:31 -07:00
Vinnie OkadaandVinnie Okada 49c3cc85c4 Remove the email patches link for merge commits
Rugged's `to_mbox` method doesn't work for merge commits, so don't
display the option to download merge commits as email patches.
2015-03-23 22:21:40 -06: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
Valery Sizov b9d9ac82a9 Commit page: async load branches info
Conflicts:
	config/routes.rb
2015-02-03 09:10:56 -08:00
Dmitriy Zaporozhets 7411fb36c5 Show branches/tags as labels on commit page 2015-01-22 11:15:21 -08:00
Hannes Rosenögger 8243eb3f0e Show tags in commit view 2015-01-17 19:22:35 +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 c0e2eee38b Fix fa-download icon 2014-10-04 16:58:59 +02:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Dmitriy Zaporozhets 531f16beb0 Use new diff parsing logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 16:27:12 +03:00
skv 3d7b79e454 whitespaceses at beginning of commit messages 2014-08-14 15:19:44 +04:00
Dmitriy Zaporozhets be5b6db883 Refactor diff suppress logic and diff views
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-15 18:28:21 +03:00
Dmitriy Zaporozhets f84d015fa9 Fix commit comment count css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14 23:09:43 +02:00
Dmitriy Zaporozhets 7157f79caa Refactor js behaviours helpers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-11 15:15:08 +02:00
Dmitriy Zaporozhets 8064b3b767 Fix btn margin for commit show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-28 16:18:47 +02:00
Dmitriy Zaporozhets f92b1f3d01 Use more specific class names: grouped -> btn-grouped
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-20 13:05:33 +02:00
Dmitriy Zaporozhets 8c1d414674 Include tw bootstrap manually. Fix hide class
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-01 21:42:42 +02:00
Dmitriy Zaporozhets d7a48443ce alert-error to alert-danger
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-31 16:34:14 +02:00
Dmitriy Zaporozhets 6cbadc953f css class .hide has \!important so use gl-hide instead
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-31 00:38:53 +02:00
Dmitriy Zaporozhets 9a31844e2a Remove unnecessary ago keyword
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-30 14:49:22 +02:00
Drew Blessing fa817dffea Add time ago tooltips to show actual date/time
Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Add helper method

change to use app helper

Modify tooltips to use new helper

Convert remaining times

Adjust one tooltip
2013-12-14 15:24:12 -06:00
Dmitriy Zaporozhets 2b555306a1 Prevent 500 error if cant detect branches for commit 2013-10-23 19:29:29 +03:00
Andrey Kumanyaev 6173d0a92f Show branches list (which branches contains commit) on commit page 2013-10-21 22:54:37 +04:00
Dmitriy Zaporozhets 7300440a74 Improve Commit#show page UI 2013-08-12 22:22:31 +03:00
Dmitriy Zaporozhets 0d715bcd81 Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork
Conflicts:
	app/views/projects/commit/show.html.haml
	app/views/projects/compare/show.html.haml
	app/views/projects/merge_requests/branch_from.js.haml
2013-07-30 13:35:33 +03:00
Dmitriy Zaporozhets fe7bef3a53 squash commit summary in one sentence 2013-07-18 11:49:40 +03:00
Izaak Alpert 489fa5d726 MR on Fork multiple fixes
-Disable observers post test run
-Allow db:seed_fu RAILS_ENV=test to be run more than once without error
-fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned
-make notes/commits render against proper project
-MR discussion file links should reference note's project
-Added tests for commit links on edit merge request
-fixes edit issues (canceling an edited mr, updating an edited mr)
-updates tests with checks for source code updates
-still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set)

MR API: error on bad target_project

-If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target
-Fixes some busted (but hidden) test cases

Conflicts:
	app/views/merge_requests/show/_diffs.html.haml
	spec/features/notes_on_merge_requests_spec.rb

Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
2013-07-17 22:42:51 -04:00