| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
|
|
|
|
|
| |
Because the post-processing of the rendered README is dependent on the
context (i.e. the current user), do the post-processing when the
README is being displayed.
|
|
|
|
|
| |
- Move the find_file_link and download partial into the project tree_header partial
- Added Changelog
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Moved most of the functions that contained "window.doSomething" that were located at:
- app/assets/javascripts/application.js
To the following file:
- app/assets/javascripts/lib/utils/common_utils.js
The functions listed here:
- window.ajaxGet
- window.split
- window.extractLast
- window.rstrip
- window.disableButtonIfEmptyField
- window.disableButtonIfAnyEmptyField
- window.sanitize
- window.unbindEvents
- window.shiftWindow
Now will be accessible from the "gl.utils" namespace
|
| |
|
| |
|
|
|
|
|
|
|
| |
Integrates changes from ClemMakesApps' commit:
8581e152, although it was reverted to avoid frustrating conflicts.
See MR: !5530 (diffs)
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 8581e152ef8fa27b6670760d39b7f06dab5f796b.
This creates really difficult conflicts with another MR that was
worked on simulataneously. That MR mostly encompassed the aims of
this commit.
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5308/commits
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add last commit time to repo view
## What does this MR do?
Adds the last commit time to the repository file view
## Are there points in the code the reviewer needs to double check?
Just need to make sure it works well in responsive (It is working well to my knowledge :smiley: )
## Why was this MR needed?
Allow users to see more information related to the last commit
## What are the relevant issue numbers?
Closes #20224
## Screenshots (if relevant)
Before:
![Screen_Shot_2016-07-27_at_1.54.03_PM](/uploads/2b3da5c6b82965fd302abe590d2b0e46/Screen_Shot_2016-07-27_at_1.54.03_PM.png)
After:
![Screen_Shot_2016-07-27_at_1.54.09_PM](/uploads/1f5f5fe1bd6f193090067a41ac4e3c66/Screen_Shot_2016-07-27_at_1.54.09_PM.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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)
See merge request !5530
|
| | |
|
| |
| |
| |
| |
| | |
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_14347679
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5142#note_14347470
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
artifacts-from-ref-and-build-name
* upstream/master: (516 commits)
Rename `run` task helper method to prevent conflict with StateMachine
Add a method in Project to return a cached value of total count of projects
Add Changelog entry for Grape upgrade [ci skip]
Fix Grape tests.
Retain old behavior
Update Grape from 0.13.0 to 0.15.0.
adds second batch of tests changed to active tense
fixes part1 of files to start using active tense
Clarify the features for generating default label sets
Update tree view to sort folders with submodules
Memoize CI config node validator to prevent leaks
fix MR source project assignment
remove offending empty line
Rails prefers require_dependency so that it won't require twice:
use Unix line endings for API documentation
use long options for curl examples in API documentation (!5703)
Prefixes removed branches name with PR number when importing PR from GH
Update CHANGELOG
Remove SHA suffix for removed branches name when importing PR from GH
add linting script for documentation
...
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Currently trees are sorted in the fashion:
- folders
- files
- submodules
with each section sorted alphabetically
This changes to this system:
- folders and submodules (sorted together)
- files
|
| | |
|
|/ |
|
| |
|
|
|
|
| |
Closes #18353
|
| |
|
|
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
|
|
|
|
|
| |
With new navigation design it makes no sense to duplicate title in the
header
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |
|
|
|
|
| |
Closes #13254
|
| |
|
|
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |
|
|\
| |
| |
| |
| | |
# Conflicts:
# app/views/projects/tree/_tree_header.html.haml
|
| | |
|
| | |
|
|/ |
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
Default target branch to patch-n when editing file in protected branch
Fixes #3441
See merge request !2021
|
| | |
|
| | |
|
|\ \
| |/ |
|
| | |
|