summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avatar_n_plus_one' into 'master'Rémy Coutable2017-09-261-2/+5
|\
| * Allow n+1s caused by avatar fetches on the project dashboard. See https://git...avatar_n_plus_oneAndrew Newdigate2017-09-251-2/+5
* | Merge branch 'mobile-breadcrumbs-divider' into 'master'Annabel Dunstone Gray2017-09-262-5/+7
|\ \
| * | Fix sidebar mobile toggle button bordermobile-breadcrumbs-dividerPhil Hughes2017-09-262-5/+7
* | | Merge branch 'dm-bitbucket-import-truncated-shas' into 'master'Robert Speicher2017-09-261-6/+5
|\ \ \
| * | | Remove unnecessary commentsDouwe Maan2017-09-251-2/+0
| * | | Properly compare diff refs and diff positions when shas are truncatedDouwe Maan2017-09-251-5/+6
| | |/ | |/|
* | | Merge branch 'changes-bar-dynamic-placeholder' into 'master'Filipa Lacerda2017-09-263-16/+32
|\ \ \
| * | | refactor tests to actually test browser behaviourPhil Hughes2017-09-251-1/+1
| * | | removed commented out CSSPhil Hughes2017-09-252-6/+1
| * | | spec fixesPhil Hughes2017-09-221-0/+6
| * | | Dynamically create offset for sticky barPhil Hughes2017-09-222-12/+27
* | | | Moves cycle analytics components into vue filesFilipa Lacerda2017-09-2618-432/+399
| |_|/ |/| |
* | | Merge branch 'remove-old-nav-styles' into 'master'Phil Hughes2017-09-2698-540/+83
|\ \ \
| * | | Fix UI bugsremove-old-nav-stylesAnnabel Dunstone Gray2017-09-253-12/+15
| * | | Fix specsAnnabel Dunstone Gray2017-09-253-3/+1
| * | | Remove all old sub nav barsAnnabel Dunstone Gray2017-09-2574-324/+5
| * | | Combine all search releated CSSAnnabel Dunstone Gray2017-09-252-110/+47
| * | | Remove unused admin subnavsAnnabel Dunstone Gray2017-09-2517-110/+36
| * | | Move new nav into main CSS folderAnnabel Dunstone Gray2017-09-254-4/+2
* | | | Merge branch 'winh-user-dropdown-nowrap' into 'master'Phil Hughes2017-09-261-0/+8
|\ \ \ \
| * | | | Avoid wrapping users in dropdownwinh-user-dropdown-nowrapWinnie Hellmann2017-09-211-0/+8
* | | | | Merge branch 'fix-locked-shared-runners-problem' into 'master'Kamil Trzciński2017-09-261-1/+1
|\ \ \ \ \
| * | | | | Fix locked shared runners problemTomasz Maczukin2017-09-251-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch '31094-define-color-priorities' into 'master'Annabel Dunstone Gray2017-09-2612-58/+58
|\ \ \ \ \
| * | | | | Update light colors, remove ’25’ and add ‘950’ shades31094-define-color-prioritiesPedro Moreira da Silva2017-09-2312-58/+58
* | | | | | Merge branch 'acet-repo-editor-fix-reopening-existing-file' into 'master'Jacob Schatz2017-09-251-1/+1
|\ \ \ \ \ \
| * | | | | | RepoEditor: Fix reopening the existing file on refresh.acet-repo-editor-fix-reopening-existing-fileFatih Acet2017-09-221-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Fix a dash being rendered in the note's access roleMicael Bergeron2017-09-251-1/+2
* | | | | | Merge branch 'docs/chmod-644' into 'master'Rémy Coutable2017-09-2510-0/+0
|\ \ \ \ \ \
| * | | | | | Check for exec permissions also in app/docs/chmod-644Achilleas Pipinellis2017-09-2510-0/+0
* | | | | | | Merge branch '38155-autodevops-typo' into 'master'Achilleas Pipinellis2017-09-251-1/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix auto devops typos in Pipeline Settings viewMark Fletcher2017-09-221-1/+2
| | |/ / / / | |/| | | |
* | | | | | Removes cycle analytics service and store from global namespaceFilipa Lacerda2017-09-253-59/+49
* | | | | | Merge branch '38189-fix-user-avatar-url-cdn' into 'master'Douwe Maan2017-09-252-10/+17
|\ \ \ \ \ \
| * | | | | | Add `data-src` when image is to be lazy loaded, use `tag` helper instead of `...kushalpandya2017-09-251-9/+16
| * | | | | | Remove unnecessary use of `gsub`kushalpandya2017-09-251-1/+1
* | | | | | | Merge branch 'improve_sorting_list' into 'master'Douwe Maan2017-09-256-188/+227
|\ \ \ \ \ \ \
| * | | | | | | Improve list of sorting optionsVitaliy @blackst0ne Klachkov2017-09-236-188/+227
| |/ / / / / /
* | | | | | | Merge branch 'project-page-clearer' into 'master'Filipa Lacerda2017-09-253-3/+10
|\ \ \ \ \ \ \
| * | | | | | | simplify link_to callproject-page-clearerPhil Hughes2017-09-221-4/+2
| * | | | | | | Fixes dashboard/projects empty state showing when viewing personal projectsPhil Hughes2017-09-222-3/+3
| * | | | | | | Add context tabs to dashboard/projectsPhil Hughes2017-09-222-0/+9
* | | | | | | | Merge branch 'fly-out-nav-mousepos-error' into 'master'Filipa Lacerda2017-09-251-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | spec fixesfly-out-nav-mousepos-errorPhil Hughes2017-09-221-1/+1
| * | | | | | | Fixed fly-out error if mousePos array is emptyPhil Hughes2017-09-221-1/+1
* | | | | | | | Merge branch '37287-remove-nav-gradient' into 'master'Phil Hughes2017-09-251-2/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Remove navbar gradient37287-remove-nav-gradientAnnabel Dunstone Gray2017-09-221-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '38171-workaround' into 'master'Robert Speicher2017-09-221-1/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Workaround for n+1 in Projects::TreeController#show38171-workaroundAndrew Newdigate2017-09-221-1/+4
| | |/ / / / | |/| | | |