Commit graph

22 commits

Author SHA1 Message Date
Douwe Maan
742cee756b Merge branch 'jej-22869' into 'security'
Fix information disclosure in `Projects::BlobController#update`

It was possible to discover private project names by modifying `from_merge_request`parameter in `Projects::BlobController#update`. This fixes that.

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- Tests
  - [x] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

https://gitlab.com/gitlab-org/gitlab-ce/issues/22869

See merge request !2023
2016-11-28 21:25:18 -03:00
Luke Bennett
680efd4f8d
Added subnav to labels edit+new and milestones edit+new+show
Added subnav to blame show, blob edit, builds show, commit builds, commit show, environments edit and pipelines show

Added subnav to new enviro view

Added sidebar top position calculation logic

Added sidebar translation to follow the subnav up when the body is scrolled until a certain limit
2016-10-07 12:46:46 +01:00
Sean McGivern
9cf6d4514b Move editor paths to helper 2016-08-19 16:17:14 +01:00
Connor Shea
0baaf490e2 Only load Ace on Snippets and file edit pages. 2016-08-18 21:48:10 +01:00
Frank West
ade0c2c892 Prevents accidental overwrites of commits from UI
Currently when a user performs an update of a file through the UI  and there
has already been a change committed to the file the previous commits will be
overwritten without a check to see if the file has been changed.

This commit uses the last commit sha at the time the user starts editing the
file and compares it with the current sha of the file being edited to ensure
they are the same before committing the file. If the shas do not match we
throw an exception preventing the commit from the commit from occurring.

Fixes #5857
2016-08-15 02:34:55 +00:00
Dmitriy Zaporozhets
edcdeb86fe
Remove icons from file edit tabs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-07-04 19:47:24 +03:00
Dmitriy Zaporozhets
cdcb354f17
Remove header title from project pages
With new navigation design it makes no sense to duplicate title in the
header

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-26 17:58:44 +02:00
Robert Speicher
76ed2afcfc Change js-quick-submit behavior to expect the class on the form
Now it will work on any field inside that form, and it's easier to scope
new behavior, which is what we're adding next!
2016-03-02 15:11:15 -05:00
Dmitriy Zaporozhets
03090a88d8
Replace all navigation menu with nav-links class
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-13 15:58:04 +01:00
Douwe Maan
d9c82d679f Automatically fork a project when not allowed to edit a file. 2015-12-18 10:03:34 +01:00
Douwe Maan
67ff47b39c Capitalize tab titles 2015-12-02 14:53:11 +01:00
Douwe Maan
e945ec0280 Add "Start a new merge request" option to every commit form 2015-11-17 18:53:56 +01:00
Dirceu Pereira Tiegs
3d50b99d01 Add option to create merge request when editing/creating a file 2015-10-19 20:25:35 -02:00
Douwe Maan
d89ae7df2c Move project header title definition to view in question. 2015-09-17 12:16:24 +02:00
Dmitriy Zaporozhets
dacff8f014
Fix UI for web editor
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-15 11:17:22 +02:00
Robert Speicher
f6503f71f9 Remove disableButtonIf[Any]EmptyField calls from forms
These have been replaced by the "requiresInput" behavior.
2015-06-26 22:07:59 -04:00
Douwe Maan
26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Valery Sizov
71a844cdae Web Editor: save to new branch 2015-02-24 11:43:20 +02: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
65e88f1e1a Fixed few tests and improved css style 2015-01-26 22:39:48 -08:00
Dmitriy Zaporozhets
a3d879d427 Refactor web editor 2015-01-26 20:57:42 -08:00
Dmitriy Zaporozhets
752cb506c0 Refactor blob views 2015-01-26 15:03:30 -08:00
Renamed from app/views/projects/edit_tree/show.html.haml (Browse further)