summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '36582-fix-note-resolved-icon' into 'master'evn-fix-formatting-of-claFatih Acet2017-08-281-0/+1
|\ | | | | | | | | | | | | Update and fix resolvable note icons for easier recognition Closes #36582 See merge request !13821
| * Update and fix resolvable note icons for easier recognition36582-fix-note-resolved-iconEric Eastwood2017-08-251-0/+1
| |
* | Merge branch '35721-auth-style-confirmation' into 'master'Clement Ho2017-08-251-0/+8
|\ \ | |/ |/| | | | | | | | | Authorizations regarding OAuth - style confirmation Closes #35721 See merge request !13691
| * Authorizations regarding OAuth - style confirmationJacopo2017-08-241-0/+8
| | | | | | | | | | Changed the styling of OAuth authorization page in order to follow the styling structure described in #28849.
* | Changed all font-weight values to 400 and 600Dimitrie Hoekstra2017-08-2423-54/+56
| |
* | Merge branch '36496-badges-should-not-be-huge' into 'master'Clement Ho2017-08-221-0/+3
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Badges should not be HUGE" Closes #36496 See merge request !13635
| * | Sometimes you don't see the forrest because of all the trees, set now the ↵36496-badges-should-not-be-hugeTim Zallmann2017-08-181-0/+3
| | | | | | | | | | | | preloading sizes to specific lazy class
* | | Make project selection dropdown consistentwinh-projects-select-dropdownwinh2017-08-203-2/+40
| | |
* | | Make issuable filter dropdown style consistentWinnie Hellmann2017-08-182-9/+17
| |/ |/|
* | Merge branch 'winh-admin-user-actions-dropdown' into 'master'Clement Ho2017-08-172-0/+7
|\ \ | | | | | | | | | | | | Make admin user actions dropdown consistent See merge request !13630
| * | Make admin user actions dropdown consistentwinh-admin-user-actions-dropdownwinh2017-08-172-0/+7
| |/
* | Fixes the blown up emoji problem in notesTim Zallmann2017-08-171-1/+2
|/
* Make sort by dropdown style consistentWinnie Hellmann2017-08-161-0/+2
|
* Merge branch 'fix-autocomplete-group' into 'master'Phil Hughes2017-08-161-0/+10
|\ | | | | | | | | | | | | Fix username autocomplete group name with no avatar alignment Closes #36502 See merge request !13578
| * Fix username autocomplete group name with no avatar alignmentfix-autocomplete-groupClement Ho2017-08-151-0/+10
| |
* | Many Repo FixesJacob Schatz2017-08-152-4/+78
|/
* Merge branch 'winh-git-revision-dropdown-style' into 'master'Annabel Dunstone Gray2017-08-112-4/+6
|\ | | | | | | | | Make Git revision dropdown style consistent See merge request !13116
| * Make Git revision dropdown style consistentwinh-git-revision-dropdown-stylewinh2017-08-092-4/+6
| |
* | Fix line numbers not matching up to code in code viewer.Trevor Flynn2017-08-101-1/+1
|/
* Merge branch ↵Filipa Lacerda2017-08-081-0/+4
|\ | | | | | | | | | | | | | | | | '35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-ui' into 'master' Resolve "'Please select a file' when attempting to upload or replace from the UI" Closes #35052 See merge request !12863
| * disable file upload button while uploading35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-uiSimon Knox2017-08-081-0/+4
| | | | | | | | | | | | hide placeholder text when files have been added vertically center dropzone area content close modal after file upload succeeds
* | Merge branch 'header-z-index-fix' into 'master'Annabel Dunstone Gray2017-08-082-1/+3
|\ \ | | | | | | | | | | | | Fixed modals being below navbar See merge request !13355
| * | Fixed modals being below navbarheader-z-index-fixPhil Hughes2017-08-072-1/+3
| | |
* | | Merge branch 'master' into ideMike Greiling2017-08-075-15/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (86 commits) Show all labels 33874 confidential issue redesign Exclude merge_jid on Import/Export attribute configuration Resolve "User dropdown in filtered search does not load avatar on `master`" Re-add column locked_at on migration rollback Group-level new issue & MR using previously selected project [EE Backport] Update log audit event in omniauth_callbacks_controller.rb more eagerly bail when the state is prevented Move locked_at removal to post-deployment migration Add class to other sidebars Improve mobile sidebar reduce iterations by keeping a count of remaining enablers Store & use ConvDev percentages returned by Version app Store MergeWorker JID on merge request, and clean up stuck merges Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE DRY up caching in AbstractReferenceFilter Update CHANGELOG Add CHANGELOG entry Fix html structure Removes test for removed behavior Port form back to use form_tag ...
| * | | Resolve "User dropdown in filtered search does not load avatar on `master`"Tim Zallmann2017-08-071-0/+2
| | | |
| * | | Group-level new issue & MR using previously selected projectBryce Johnson2017-08-071-1/+25
| |/ /
| * | Merge branch '15664-remove-jquery-nicescroll' into 'master'Phil Hughes2017-08-072-14/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove jQuery Nicescroll" Closes #15664, #30860, and #35885 See merge request !13262
| | * | remove nicescroll from jobs page and remove the library from common.bundle.jsMike Greiling2017-08-042-14/+3
| | | |
| * | | Merge branch 'zj-project-templates' into 'master'Sean McGivern2017-08-071-0/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow projects to be started from a template Closes #32420 See merge request !13108
| | * \ \ Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-0714-17/+176
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (623 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix pipeline icon in contextual nav for projects Since mysql is not a priority anymore, test it less Fix order of CI lint ace editor loading Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Fix spec Fix spec Fix spec Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Add changelog Install yarn via apt in update guides Use long curl options fix Add a spec for concurrent process Remove monkey-patched Array.prototype.first() and last() methods ...
| | * | | | Minor adjustments after UX reviewFilipa Lacerda2017-08-041-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Fixes scss lint errors
* | | | | | use 100vh instead of flip flopping between the two - works on all suported ↵Regis2017-08-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | browsers
* | | | | | Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ideJacob Schatz2017-08-075-23/+75
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into ideMike Greiling2017-08-075-23/+75
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (177 commits) Add changelog Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14 Make contextual sidebar collapsible Fixed sidebar context header hover colors Use correct `Environment`-class within `Gitlab` namespace Remove gl.Activities from Commits page Move `let` calls inside the `describe` block using them Add `/assign me` alias support for assigning issuables to oneself GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError Use `broken_storage` in the fs_shards_spec. Eager load project creators for project dashboards Memoize a user's personal projects count Remove redundant query from User#recent_push Improve checking if projects would be returned Change spelling of gitlab-shell Remove unused #tree-holder Add custom linter for inline JavaScript to haml_lint Rename user_can_admin? because it's more accurate Synchronous zanata community contribution translation Add Korean translation to i18n ...
| | * | | | | Merge branch 'navbar-z-index-higher' into 'master'Annabel Dunstone Gray2017-08-071-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase the z-index of the navbar Closes #35935 See merge request !13282
| | | * | | | | Increase the z-index of the navbarnavbar-z-index-higherPhil Hughes2017-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #35935
| | * | | | | | clean up merge request widget UISimon Knox2017-08-072-1/+14
| | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch '27616-fix-contributions-graph-utc-offset-mysql' into 'master'Tim Zallmann2017-08-061-0/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Timezone Inconsistencies in User Contribution Calendar Closes #27616 and #1943 See merge request !13208
| | | * | | | | display system timezone underneath activity calendarMike Greiling2017-07-281-0/+1
| | | | | | | |
| | * | | | | | Update top bar issues iconAnnabel Dunstone Gray2017-08-041-2/+2
| | | | | | | |
| | * | | | | | Make new dropdown dividers full widthwinh-new-dropdown-dividerswinh2017-08-041-0/+4
| | | | | | | |
| | * | | | | | Merge branch 'diff-changed-files-dropdown' into 'master'Filipa Lacerda2017-08-041-0/+1
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved changed files into a dropdown Closes #29778 See merge request !13128
| | | * | | | | fixed haml lintPhil Hughes2017-08-031-0/+1
| | | | |/ / / | | | |/| | |
| | * | | | | Use mixin for new dropdown styleWinnie Hellmann2017-08-032-20/+8
| | |/ / / /
| | * | | | Make dropdown style on project page consistentWinnie Hellmann2017-08-031-0/+45
| | | | | |
* | | | | | Show warning for big files.Jacob Schatz2017-08-071-0/+8
|/ / / / /
* | | | | Move v-cloak to a more general area.Jacob Schatz2017-08-061-0/+4
| | | | |
* | | | | Use existing truncation.Jacob Schatz2017-08-062-14/+0
| | | | |
* | | | | Merge branch 'master' into ideDouwe Maan2017-08-033-0/+48
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '35408-group-auto-avatars' into 'master'Filipa Lacerda2017-08-021-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Show auto-generated avatars in Groups dashboard tree for Groups without avatars See merge request !13188