summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add margin to filter labels19708-label-selection-clutterAnnabel Dunstone2016-07-111-1/+7
|
* Merge branch 'remove-pinto-from-flash' into 'master' Jacob Schatz2016-07-117-21/+46
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove pinTo from Flash ## What does this MR do? - replace `pinTo` of `Flash` by `parent` parameter in constructor - move positioning of layout containers from CoffeeScript to layout files - adjust styling of inline flash messages ## Are there points in the code the reviewer needs to double check? - display of flash messages in general ## Why was this MR needed? - allow finding and positioning flash message containers within layout files - allow adding different CSS classes to flash containers within layout files (necessary for fixing #18908) - allow multiple flash messages to be displayed at different places at the same time - make inline flash messages look nicer ## What are the relevant issue numbers? closes #18908, closes part of #18897 ## Screenshots ### Inline flash message (before) ![before](/uploads/c5b3cc05140eaeb9d14e481fa506ebbf/before.png) ![before-mobile](/uploads/004b1f2b9510bd97f4f8a7a6e56f17ef/before-mobile.png) ### Inline flash message (after) ![inline-flash-message](/uploads/fe2a23b63623612b696d529e81fa459e/inline-flash-message.png) ![inline-flash-mobile](/uploads/6207604acfebcf7402d77d5638c89ca8/inline-flash-mobile.png) ### Other flash messages (after) ![flash-message-issue](/uploads/d7e12bd0da68cfa333471ed102428cec/flash-message-issue.png) --- ![flash-new-project](/uploads/3465967dba83296068f154f149d26f64/flash-new-project.png) --- ![flash-sign-in](/uploads/4a5b317d5a369034f43343031607a0c2/flash-sign-in.png) --- ![flash-file-comment](/uploads/488a1119374be7e2173c0a590cfd8821/flash-file-comment.png) --- ![flash-fork](/uploads/f41964e8b910801e03eef3d7649e5009/flash-fork.png) --- ![flash-update-profile](/uploads/9fd972d6c6609fbbf86afcd99d343b5f/flash-update-profile.png) --- ### This is possible now ![flashs-everywhere](/uploads/07f425534511fb4ecaa1d7e2a9870787/flashs-everywhere.png) See merge request !4854
| * Remove `pinTo` from `Flash` and make inline flash messages look nicer (!4854)winniehell2016-06-307-21/+46
| |
* | Normalize spacing for version numbers in CHANGELOGRobert Speicher2016-07-111-3/+3
| | | | | | | | [ci skip]
* | Merge branch 'cleanup-coffeescripts-from-gitlab-ci' into 'master' Jacob Schatz2016-07-115-20/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up coffeescript files imported from GitLab CI ## What does this MR do? This MR cleans up CoffeeScript files imported from GitLab CI along with a strategy #19159. Some files should have been removed in !1987. ## Are there points in the code the reviewer needs to double check? While I think the `Build` module should be named as `Build`, not `CiBuild` in the JavaScript namespace, please check if it should. ## Why was this MR needed? Removing unused coffeescript files reduces time to build JS and so time to transfer even in production. The fewer files, the better, too. ## What are the relevant issue numbers? Closes #19159 ## Screenshots (if relevant) n/a ## Does this MR meet the acceptance criteria? - [skipped] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [skipped] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [skipped] API support added - Tests - [skipped] 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) See merge request !4925
| * | Rename CiBuild as BuildTakuya Noguchi2016-07-072-4/+4
| | |
| * | Clean up coffeescript files imported from GitLab CITakuya Noguchi2016-07-074-16/+0
| | |
* | | Merge branch 'fix/import-event-error' into 'master' Robert Speicher2016-07-114-2/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix problems with events under notes importing GitLab projects Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19588 See merge request !5154
| * | | fix changelog...fix/import-event-errorJames Lopez2016-07-111-5/+3
| | | |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-07-11613-4819/+13622
| |\ \ \ | | | | | | | | | | | | | | | fix/import-event-error
| * | | | squashed - refactor to cope with sub sub N relations probably using the ↵James Lopez2016-07-114-2/+63
| | | | | | | | | | | | | | | | | | | | sub_relations method recursively.
* | | | | Merge branch 'mr-close-btn' into 'master' Robert Speicher2016-07-112-4/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly shows close button on merge requests Closes #19403 See merge request !5036
| * | | | | Moved merge request button visibility out of issue_helpermr-close-btnPhil Hughes2016-07-113-5/+9
| | | | | |
| * | | | | Correctly shows close button on merge requestsPhil Hughes2016-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Closes #19403
* | | | | | Merge branch 'fix-sent-notification-position' into 'master' Rémy Coutable2016-07-112-0/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow SentNotification#position to be set as string or hash Fixes https://sentry.gitlap.com/gitlab/staginggitlabcom/issues/8491/ See merge request !5189
| * | | | | | Allow SentNotification#position to be set as string or hashDouwe Maan2016-07-112-0/+37
| | | | | | |
* | | | | | | Merge branch 'single-file-diffs' into 'master' Douwe Maan2016-07-1133-486/+1100
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Single file diffs Closes #14103. Related (not part of this MR): #19553. This adds a `diff_for_path` action to each place we render diffs (commit, compare, new MR, existing MR) which renders the diff for a single path. The action is always available with the same params as the 'parent' action, to make it simpler to generate the URIs. If a diff is bigger than 10 KB, it will be collapsed by default and have a data attribute added. You can then click the message or the filename to expand that diff. For expanded files, you can collapse and expand them, but they won't make any AJAX requests. ![Expand_and_collapse_diffs](/uploads/a4072029085082b85c47006f67ac531c/Expand_and_collapse_diffs.gif) See merge request !4990
| * | | | | | | Handle more than two paths in MergeRequest#diffsSean McGivern2016-07-112-4/+5
| | | | | | | |
| * | | | | | | Fix feature specs on CIsingle-file-diffsSean McGivern2016-07-112-22/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL's text column isn't big enough for the diffs in the expand-collapse-diffs branch.
| * | | | | | | Merge branch 'master' into single-file-diffsSean McGivern2016-07-1169-388/+1123
| |\ \ \ \ \ \ \
| * | | | | | | | Support renames in diff_for_path actionsSean McGivern2016-07-1110-51/+89
| | | | | | | | |
| * | | | | | | | Tidy up spec action namesSean McGivern2016-07-083-14/+14
| | | | | | | | |
| * | | | | | | | Memoize diffs with path options set separatelySean McGivern2016-07-081-1/+2
| | | | | | | | |
| * | | | | | | | review changesLuke "Jared" Bennett2016-07-085-11/+9
| | | | | | | | |
| * | | | | | | | Make expand_all param more explicitSean McGivern2016-07-084-6/+6
| | | | | | | | |
| * | | | | | | | DRY up diff_for_path actionsSean McGivern2016-07-085-98/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Move render method to a concern, not a helper. 2. Let DiffHelper#diff_options automatically add the path option. 3. Move more instance var definitions to before filters.
| * | | | | | | | Remove unused argument to CompareService#executeSean McGivern2016-07-082-5/+11
| | | | | | | | |
| * | | | | | | | Fix comments on collapsed and expanded diffsSean McGivern2016-07-081-26/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't save the HTML as it was on page load, because comments etc. add content that we would lose if we kept the initial HTML. Instead, shuffle elements around.
| * | | | | | | | Allow expanding all diffs at onceSean McGivern2016-07-084-1/+45
| | | | | | | | |
| * | | | | | | | Ensure only renderable text diffs are collapsedSean McGivern2016-07-088-10/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other diffs (those that are too large to render anyway, image diffs, diffs suppressed by .gitattributes) should be rendered immediately.
| * | | | | | | | Added frontend collapsible behaviorLuke "Jared" Bennett2016-07-083-0/+55
| | | | | | | | |
| * | | | | | | | Disable overflow messagesSean McGivern2016-07-086-58/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the option to expand and collapse individual diffs, these aren't needed any more.
| * | | | | | | | Collapse large diffs by defaultSean McGivern2016-07-0817-374/+762
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.
* | | | | | | | | Merge branch 'remove-duplicate-api-field' into 'master' Rémy Coutable2016-07-112-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entities: remove :description from MergeRequest ## What does this MR do? Removes a duplicate `description` key from API JSON objects. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? `description` is already exported via `ProjectEntity` and doesn't need to be listed in `MergeRequest` as well. ## What are the relevant issue numbers? N/A ## Screenshots (if relevant) N/A ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5099
| * | | | | | | | | entities: remove :description from MergeRequestBen Boeckel2016-07-112-1/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | It is already part of ProjectEntity.
* | | | | | | | | Merge branch 'send-entry-via-Gitlab-Workhorse-Send-Data' into 'master' Douwe Maan2016-07-114-7/+30
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Gitlab-Workhorse-Send-Data to send entry ## What does this MR do? Use Gitlab-Workhorse-Send-Data to send entry: Closes #19224, Closes #19128 Also requires this MR to work: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/53 ## Are there points in the code the reviewer needs to double check? Do we have a test for this? ## Why was this MR needed? This way gitlab-workhorse does not have to call any API. See merge request !5094
| * | | | | | | | Just remove the prefix, feedback:send-entry-via-Gitlab-Workhorse-Send-DataLin Jen-Shin2016-07-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5094#note_12987385
| * | | | | | | | Just give regular 404, feedback:Lin Jen-Shin2016-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5094#note_12984211
| * | | | | | | | Fix one of the failing tests. Test against the headersLin Jen-Shin2016-07-061-4/+9
| | | | | | | | |
| * | | | | | | | Use Gitlab-Workhorse-Send-Data to send entry:Lin Jen-Shin2016-07-053-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #19224, Closes #19128 Also requires this MR to work: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/53
* | | | | | | | | Merge branch 'remove-not-released-status' into 'master' Robert Speicher2016-07-111-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "not released" status from documentation [ci skip] See merge request !5024
| * | | | | | | | | Remove not released statusMax Raab2016-06-301-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'dz-sidebar-shadow' into 'master' Dmitriy Zaporozhets2016-07-111-0/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add side shadow for unpinned sidebar See merge request !5167
| * | | | | | | | | | Refactor box-shadow style for sidebar to satisfy css lintdz-sidebar-shadowDmitriy Zaporozhets2016-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Add side shadow for unpinned sidebarDmitriy Zaporozhets2016-07-091-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | Merge branch 'dz-today-issue-color' into 'master' Dmitriy Zaporozhets2016-07-111-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make color that highligh today issues more lightweight See merge request !5168
| * | | | | | | | | | Lower case todya issue colorsdz-today-issue-colorDmitriy Zaporozhets2016-07-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Make color that highligh today issues more lightweightDmitriy Zaporozhets2016-07-091-2/+2
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | Merge branch 'fix-type-in-project-factory' into 'master' Rémy Coutable2016-07-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in factory for projects.rb ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5100
| * | | | | | | | | | Fix typo in factory for projects.rbYatish Mehta2016-07-051-1/+1
| | | | | | | | | | |