Commit Graph
3655 Commits
Author SHA1 Message Date
Douwe Maan 6ce25e7b4c Rename MergeRequest methods that return commits or shas to be more clear and consistent 2016-07-06 18:50:58 -04:00
Jacob Schatz c66a7b0e94 Merge branch 'build-auto-refresh' into 'master'
Fixed issue with build auto-refresh not working

## What does this MR do?

Due to the `.json` at the end of the build URL fetch, the page wont correctly auto-reload the build log. This fixes that.

See merge request !5110
2016-07-06 21:04:27 +00:00
Annabel Dunstone 47e5b5397e Get rid of pluralize on stage names 2016-07-06 11:09:28 -05:00
Phil Hughes 2044af6ced Fixed issue with build auto-refresh not working 2016-07-06 10:16:16 +01:00
Phil Hughes e3390901a3 Chnaged padding of project header nav 2016-07-05 09:19:01 +01:00
Phil Hughes 509c2ca309 Fixed issue with Forked from text not being visible 2016-07-04 16:34:53 +01:00
Phil Hughes 16ca8ec57f Updated spacing
CHANGELOG item
2016-07-04 16:34:53 +01:00
Phil Hughes eac81b988e Updated project header
Closes #18544
2016-07-04 16:34:53 +01:00
Rémy Coutable bd78f5733c Exclude requesters from Project#members, Group#members and User#members
And create new Project#requesters, Group#requesters scopes.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-01 17:44:46 +02:00
Rémy Coutable 8625bd3622 Improve the request / withdraw access button
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-01 12:48:54 +02:00
Gabriel Mazetto ccd439da5d Merge branch 'build-reopen-json' into 'master'
Build path sends JSON file path

## What does this MR do?

Fixes an issue with browser caching JSON response on build page.

Steps to see:

- Open build (https://gitlab.com/gitlab-org/gitlab-ce/builds/2030226)
- Close tab
- Re-open tab

You should now see some JSON 😞 

This MR appends `.json` to the end of the build URL so that the browser can't cache it as the same URL.


See merge request !4935
2016-06-30 19:39:51 +00:00
Eric K IdemaandRémy Coutable 12aa1f898d Import from Github using Personal Access Tokens.
This stands as an alternative to using OAuth to access a user's Github
repositories.  This is setup in such a way that it can be used without OAuth
configuration.

From a UI perspective, the how to import modal has been replaced by a full
page, which includes a form for posting a personal access token back to the
Import::GithubController.

If the user has logged in via GitHub, skip the Personal Access Token and go
directly to Github for an access token via OAuth.
2016-06-30 18:48:17 +02:00
Valery Sizov 13fc95acc4 Remove unnecessary parens 2016-06-30 16:01:26 +03:00
Yorick Peterse 1a68a0a6f5 Merge branch 'shards' into 'master'
Implement multiple repository mount points

See merge request !4578
2016-06-30 11:02:43 +00:00
Annabel DunstoneandDmitriy Zaporozhets 5987ad2569 Add sub nav to file view 2016-06-30 10:03:02 +02:00
Alejandro Rodríguez 86359ec854 Refactor repository paths handling to allow multiple git mount points 2016-06-29 22:30:31 -04:00
Stan Hu 8c29b0b065 Memoize the maximum access level for the author of notes
In #19273, we saw that retrieving ProjectTeam#human_max_access for each
note takes the bulk of the time when rendering certain issues or merge requests.
We observe that most of the comments in an issue are typically done by the
same users. This MR memoizes the max access level by user ID.
2016-06-29 06:26:00 -07:00
Jacob Schatz 9c2fbcb064 Merge branch 'md-toolbar-multiline-code' into 'master'
Markdown toolbar inserts code blocks

## What does this MR do?

Adds the ability to insert code blocks with the markdown toolbar buttons. This is done by selecting the block & then clicking the code button.

## What are the relevant issue numbers?

Closes #19173 


See merge request !4950
2016-06-29 05:17:39 +00:00
Jacob Schatz 6ff039ac44 Merge branch 'lbennett/gitlab-ce-2542-implement-updated-ui-for-new-project-page' into 'master'
Implement UI for new project page

## What does this MR do?

Updates the project creation page to conform with the latest UI updates.

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

Ney.

## Why was this MR needed?

Updated UI.

## What are the relevant issue numbers?

Closes #2542.

## Screenshots (if relevant)

**Desktop:**

![Screen_Shot_2016-06-18_at_04.00.48](/uploads/0313eee96a2aef9ed5e048989548b133/Screen_Shot_2016-06-18_at_04.00.48.png)

**Mobile:**

![Screen_Shot_2016-06-18_at_04.01.00](/uploads/505b110c3fcbf523aac08797db9f6781/Screen_Shot_2016-06-18_at_04.01.00.png)

See merge request !4766
2016-06-28 16:19:46 +00:00
Annabel DunstoneandDmitriy Zaporozhets 706c5a1399 Switched mobile button icons to ellipsis and angle 2016-06-28 16:01:42 +02:00
Phil Hughes 0d6d8376e6 Build path sends JSON file path 2016-06-28 12:06:28 +01:00
Luke "Jared" Bennett 957143347c Wiped old page and started on new UI
Completed new project page

Updated CHANGELOG

Corrected 'Create project' button

Made responsive

Added gitlab export button

Changed Spinach test to match updated UI

reverted test changes and fixed UI

Corrected 'Repo by URL' text

Fixed static namespace style

Added errors partial

Added padding to bottom of page-with-sidebar
2016-06-28 01:17:01 +01:00
http://jneen.net/ f8b80f7fae add custom highlighting via .gitattributes
paired with @stanhu
2016-06-27 14:17:49 -07:00
Annabel Dunstone 550e40a53c Add conditional for new pag link 2016-06-27 11:52:38 -05:00
Annabel Dunstone 5d7153e61d Remove duplicate new page btn from edit wiki 2016-06-27 11:52:38 -05:00
Phil Hughes 4678e22b5f Markdown toolbar inserts code blocks
Closes #19173
2016-06-27 16:12:03 +01:00
Jacob Schatz e45d6043e8 Merge branch 'js-content-for' into 'master'
Re-implement page-specific JS in a better way.

## What does this MR do?

This rebuilds the way we do page-specific JavaScript assets for a few reasons:

- The current implementation does not work with Subresource Integrity (!4808)
- The current implementation doesn't allow caching of libraries because each page we hook up with this system will have a separate application.js. Meaning that for every page that uses Ace Editor, we'd have to load Ace Editor plus any GitLab-specific scripts in the same file, making local caching of just Ace Editor impossible.
- The current implementation is rather hacky.

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

That Sprockets doesn't choke on this when we use precompiled assets.

## What are the relevant issue numbers?

#14372

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

cc: @jschatz1 @pavelloz

Thanks to @pavelloz for his example implementation which was very useful.

See merge request !4883
2016-06-24 20:51:02 +00:00
Yorick Peterse d470f3d195 Support for rendering/redacting multiple documents
This commit changes the way certain documents are rendered (currently
only Notes) and how documents are redacted. Previously both rendering
and redacting would run on a per document basis. The result of this was
that for every document we'd have to run countless queries just to
figure out if we could display a set of links or not.

This commit changes things around so that redacting Markdown documents
is no longer tied into the html-pipeline Gem. This in turn allows it to
redact multiple documents in a single pass, thus reducing the number of
queries needed.

In turn rendering issue/merge request notes has been adjusted to take
advantage of this new setup. Instead of rendering Markdown somewhere
deep down in a view the Markdown is rendered and redacted in the
controller (taking the current user and all that into account). This has
been done in such a way that the "markdown()" helper method can still be
used on its own.

This particular commit also paves the way for caching rendered HTML on
object level. Right now there's an accessor method Note#note_html which
is used for setting/getting the rendered HTML. Once we cache HTML on row
level we can simply change this field to be a column and call a "save"
whenever needed and we're pretty much done.
2016-06-24 11:46:39 +02:00
Annabel DunstoneandJacob Schatz 12aca07723 Fix positioning of Repository sub nav scrolling 2016-06-23 17:45:22 -04:00
Annabel DunstoneandJacob Schatz ee8b0d37fa Move fade divs out of every scrolling container; remove unneeded scrolling CSS 2016-06-23 17:45:22 -04:00
Connor Shea ff01ca9c96 Trying to make this work with sprockets in production. 2016-06-23 11:42:52 -06:00
Connor Shea 4cca9a3e0f Reorganize the lib directory. 2016-06-23 10:55:40 -06:00
Connor Shea 7ce0968a52 Re-implement page-specific JS in a better way.
This makes larger libraries more cacheable and will allow us to use SRI with the dynamically included libraries.
2016-06-23 10:33:38 -06:00
Steve Norman 23c898fc40 Fix merge requests project settings help link anchor. 2016-06-23 16:49:58 +01:00
Douwe Maan 9676421d01 Merge branch 'fix-network-links' into 'master'
Fix Network graph links.

## What does this MR do?

Fixes the Network graph links so they no longer link to `/master#{escape_javascript(@commit_url)}`

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

Don't think so.

## Why was this MR needed?

Single quotes don't evaluate Ruby expressions.

## What are the relevant issue numbers?

Fixes #18894.

cc: @jschatz1 

See merge request !4832
2016-06-22 01:18:45 +00:00
Douwe Maan 4dcf107b26 Merge branch '18871-check-improve-how-we-display-access-requesters-in-admin-area' into 'master'
Display group/project access requesters separately in admin

## What does this MR do?

It displays the access requesters in a separate list in group & project members pages.

It also harmonize the members counter UI to use `%span.badge` everywhere (in the admin & non-admin members views).

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

No.

## Why was this MR needed?

To not confuse access requesters with actual members.

## What are the relevant issue numbers?

Closes #18871.

## Screenshots

### Group members

| Before | After |
| --------- | ---- |
| ![group-members-before](/uploads/2f15137e073fd3a63bc2cb7b2217cb6c/group-members-before.png) | ![group-members-after](/uploads/5b643974505cfa57783fa0320d3bf8b2/group-members-after.png) |

### Project members

| Before | After |
| --------- | ---- |
| ![project-members-before](/uploads/9c48dcd3736e42de84061b1201ee0b06/project-members-before.png) | ![project-members-after](/uploads/8e04c92ef0bba3de7e2405618632b27d/project-members-after.png) |

### Admin group members

| Before | After |
| --------- | ---- |
| ![admin-group-members-before](/uploads/7fda8c2c94b697bea6655ba892ba45e7/admin-group-members-before.png) | ![admin-group-members-after](/uploads/ea25717001794f75939c679b80308c3a/admin-group-members-after.png) |

### Admin project members

| Before | After |
| --------- | ---- |
| ![admin-project-members-before](/uploads/ba9d3ec52adbda6bb3d45ad9ac5243d3/admin-project-members-before.png) | ![admin-project-members-after](/uploads/3b889a029a9756e9ed2781b45c4dd9cb/admin-project-members-after.png) |

## Does this MR meet the acceptance criteria?

- [x] No CHANGELOG since this is related to the original "request access" MR.
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4798
2016-06-22 01:17:08 +00:00
Dmitriy Zaporozhets ff84cc0b81 Merge branch 'master' into 18533-graphs-wiki-subnav
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-22 00:00:41 +03:00
Dmitriy Zaporozhets 76c6b9c8d8 Put wiki page history content into container
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-21 23:54:00 +03:00
Jacob Schatz 0f902d51a6 Merge branch '18934-compare-gray-block' into 'master'
Update gray block under subnav to match other pages

## What does this MR do?
Makes Compare sub nav full width; replaces gray block with white one to match rest of pages

## What are the relevant issue numbers?
Closes #18934 

## Screenshots (if relevant)
![Screen_Shot_2016-06-21_at_1.14.46_PM](/uploads/43377efe7816b854f48966bcbd96a1cc/Screen_Shot_2016-06-21_at_1.14.46_PM.png)

cc @dzaporozhets 

See merge request !4838
2016-06-21 19:34:13 +00:00
Robert Speicher 63d411d755 Merge branch '17671-private-forks-list-ui-issues' into 'master'
Fixed private forks notice position in forks list

Moves the private forks notification item into the list on the forks page.

Closes #17671.

See merge request !4573
2016-06-21 18:45:14 +00:00
Connor Shea 91a112cba4 Remove unnecessary string interpolation. 2016-06-21 12:35:55 -06:00
Connor Shea 07b3bf9ec3 Fix Network graph links.
Resolves #18894.
2016-06-21 12:25:18 -06:00
Annabel Dunstone 795b8b3073 Update gray block under subnav to match other pages 2016-06-21 13:16:28 -05:00
Jacob Schatz 707e8d434d Merge branch 'fix-button-title' into 'master'
Capitalize button text

Capitalizes button text to match the rest.

See merge request !4834
2016-06-21 16:44:56 +00:00
Annabel DunstoneandJacob Schatz 25ae737df0 Add new page button to wiki home 2016-06-21 12:15:49 -04:00
Annabel DunstoneandJacob Schatz 1d7b809a01 Move new page link out of sub nav 2016-06-21 12:15:49 -04:00
Annabel DunstoneandJacob Schatz 6f642fd423 Add new style for sub header block info 2016-06-21 12:15:49 -04:00
Annabel DunstoneandJacob Schatz a02c3d09d3 Fix graph columns 2016-06-21 12:15:49 -04:00
Annabel DunstoneandJacob Schatz a4c9b4fbe9 Style wiki sub nav links 2016-06-21 12:15:49 -04:00
Annabel DunstoneandJacob Schatz 8e84153044 Style sub nav links in Graphs 2016-06-21 12:15:49 -04:00