summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dz-nested-groups' into 'master' Douwe Maan2016-12-099-89/+134
|\
| * Add nested groups support on data leveldz-nested-groupsDmitriy Zaporozhets2016-12-089-89/+134
* | Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'Douwe Maan2016-12-0816-45/+56
* | Merge branch 'html-safe-diff-line-content' into 'security' Robert Speicher2016-12-081-1/+3
* | Merge branch 'destroy-session' into 'security' Robert Speicher2016-12-081-1/+4
* | Merge branch 'fix-reset-template' into 'master' Fatih Acet2016-12-081-0/+2
|\ \
| * | Do nothing if file is undefinedfix-reset-templateAlfredo Sumaran2016-12-071-0/+2
* | | Merge branch 'system-notes-fade' into 'master' Fatih Acet2016-12-081-1/+1
|\ \ \
| * | | Fade out should be white instead of graysystem-notes-fadeAnnabel Dunstone Gray2016-12-071-1/+1
| |/ /
* | | Merge branch 'small-emoji-adjustments' into 'master' Fatih Acet2016-12-083-3/+4
|\ \ \
| * | | Various small emoji positioning adjustmentssmall-emoji-adjustmentsDimitrie Hoekstra2016-12-083-3/+4
| |/ /
* | | Merge branch 'timeago-perf-fix' into 'master' Fatih Acet2016-12-081-1/+3
|\ \ \
| * | | Fixed timeago re-rendering every elementtimeago-perf-fixPhil Hughes2016-12-071-1/+3
| | |/ | |/|
* | | Merge branch 'pipeline-stage' into 'master' Rémy Coutable2016-12-0820-113/+130
|\ \ \
| * | | Don't check if stage name doesn't existKamil Trzcinski2016-12-082-5/+3
| * | | Fix specspipeline-stageKamil Trzcinski2016-12-074-14/+14
| * | | Move .pipeline-graph to pipelines/graphKamil Trzcinski2016-12-073-3/+3
| * | | Code reviewKamil Trzcinski2016-12-075-14/+15
| * | | Fix success statusKamil Trzcinski2016-12-072-2/+3
| * | | Added Ci::Stage specsKamil Trzcinski2016-12-061-0/+4
| * | | Update stage rendering viewsKamil Trzcinski2016-12-068-42/+35
| * | | Fix handling of allowed to failure jobsKamil Trzcinski2016-12-064-9/+5
| * | | Fix handling of skipped vs success statusKamil Trzcinski2016-12-062-5/+5
| * | | Fix test failuresKamil Trzcinski2016-12-061-3/+3
| * | | Added Stage testsKamil Trzcinski2016-12-061-0/+4
| * | | Add Ci::Status::StageKamil Trzcinski2016-12-061-0/+2
| * | | Preserve stage values and use StaticModelKamil Trzcinski2016-12-061-5/+11
| * | | Introduce `Ci::Stage`, right now this is artificial object that is build dyna...Kamil Trzcinski2016-12-0611-58/+60
| * | | Fix broken pipeline rendering [ci skip]Kamil Trzcinski2016-12-062-12/+11
| * | | Support pipelines APIKamil Trzcinski2016-12-066-21/+32
* | | | Merge branch '25171-fix-mr-features-settings-hidden-when-builds-are-disabled'...Sean McGivern2016-12-083-19/+25
|\ \ \ \
| * | | | Remove wrong '.builds-feature' class from the MR settings fieldset25171-fix-mr-features-settings-hidden-when-builds-are-disabledRémy Coutable2016-12-073-19/+25
* | | | | Merge branch '24982-ux-improvement-sign-in-success-message' into 'master' Sean McGivern2016-12-081-0/+2
|\ \ \ \ \
| * | | | | fix: 24982- Remove'Signed in successfully' messagejnoortheen2016-12-071-0/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-all-dashboard' into 'master' Sean McGivern2016-12-081-0/+2
|\ \ \ \ \
| * | | | | Add issue events filter and make sure "All" really shows everythingOxan van Leeuwen2016-12-041-0/+2
* | | | | | Merge branch '24507_remove_deleted_branch_link_in_merge_request' into 'master' Sean McGivern2016-12-081-1/+1
|\ \ \ \ \ \
| * | | | | | add link_to_if helper on target_branch link on Merge Request show page for ca...Rydkin Maxim2016-12-081-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'group-members-in-project-members-view' into 'master' Sean McGivern2016-12-082-6/+30
|\ \ \ \ \ \
| * | | | | | Handle an edge-case whith inviteesgroup-members-in-project-members-viewRémy Coutable2016-12-071-4/+10
| * | | | | | Fixed if statement to use global group & project variablesPhil Hughes2016-12-051-1/+1
| * | | | | | Fixed Ruby to be better for performancePhil Hughes2016-12-022-18/+14
| * | | | | | Shows group members in the project members listPhil Hughes2016-12-022-2/+24
* | | | | | | Enable display of admonition icons in Asciidoc.Horacio Sanson2016-12-082-0/+28
| |/ / / / / |/| | | | |
* | | | | | Merge branch '25209-improve-length-validators' into 'master' Rémy Coutable2016-12-077-19/+31
|\ \ \ \ \ \
| * | | | | | Use :maximum instead of :within for length validators with a 0..N range25209-improve-length-validatorsRémy Coutable2016-12-067-19/+31
* | | | | | | Merge branch 'excoveralls_coverage' into 'master' Rémy Coutable2016-12-071-0/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add excoveralls examplePotHix2016-12-051-0/+3
* | | | | | | Merge branch 'remove-has-visible-content-caching' into 'master' Douwe Maan2016-12-071-13/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove caching of Repository#has_visible_content?remove-has-visible-content-cachingYorick Peterse2016-12-061-13/+1
View Lorry Controller Status