Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change project view default for existing users and anonymous visitors to ↵dz-fix-project-view | Dmitriy Zaporozhets | 2017-04-10 | 1 | -2/+2 |
| | | | | | | files+readme Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Merge branch 'master' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 2 | -2/+6 |
|\ | |||||
| * | Rename `ProjectBuildStatus` -> `ProjectPipelineStatus` | Bob Van Landuyt | 2017-04-07 | 1 | -1/+1 |
| | | |||||
| * | Update project build status cache when transitioning | Bob Van Landuyt | 2017-04-07 | 1 | -1/+1 |
| | | |||||
| * | Rename Ci::PipelineStatus -> Ci::ProjectBuildStatus | Bob Van Landuyt | 2017-04-07 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'master' into new-resolvable-discussion | Douwe Maan | 2017-04-06 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | # Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml | ||||
| * | Linking to edit file directly | Eric Eastwood | 2017-04-06 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-06 | 2 | -5/+30 |
|\ \ | |/ | |||||
| * | Merge branch 'path-disclosure-proj-import-export' into 'security' | DJ Mountney | 2017-04-05 | 1 | -0/+8 |
| | | | | | | | | | | Fix for path disclosure in project import/export See merge request !2080 | ||||
| * | Merge branch '30125-markdown-security' | Robert Speicher | 2017-04-05 | 1 | -5/+22 |
| | | | | | | | | | | | | Remove class from SanitizationFilter whitelist See merge request !2079 | ||||
* | | Fix specs | Douwe Maan | 2017-04-05 | 1 | -17/+0 |
| | | |||||
* | | Add specs | Douwe Maan | 2017-04-05 | 1 | -1/+1 |
|/ | |||||
* | Merge branch ↵ | Douwe Maan | 2017-03-31 | 1 | -0/+14 |
|\ | | | | | | | | | | | | | | | | | | | '25556-prevent-users-from-disconnecting-gitlab-account-from-cas' into 'master' Prevent users from disconnecting gitlab account from CAS Closes #25556 See merge request !10282 | ||||
| * | Prevent users from disconnecting gitlab account from CAS | Tiago Botelho | 2017-03-31 | 1 | -0/+14 |
| | | |||||
* | | Handle parsing OpenBSD ps output properly to display sidekiq | Sebastian Reitenbach | 2017-03-31 | 1 | -0/+8 |
|/ | | | | infos on admin->monitoring->background | ||||
* | Resolve "Gitlab administrator cannot create projects in every group" | George Andrinopoulos | 2017-03-24 | 1 | -0/+33 |
| | |||||
* | Move user_link to generic UsersHelper | Toon Claes | 2017-03-23 | 3 | -35/+38 |
| | | | | | Make the user_link helper more generic to be used for objects other than pipelines. | ||||
* | Add helpers for pipeline user link & user avatar | Toon Claes | 2017-03-22 | 1 | -0/+35 |
| | |||||
* | Revert "Merge branch '29534-todos-performance' into 'master'" | Sean McGivern | 2017-03-21 | 1 | -34/+0 |
| | | | This reverts merge request !10076 | ||||
* | Todos performance: Include associations in Finder | Jarka Kadlecova | 2017-03-20 | 1 | -0/+34 |
| | |||||
* | Fix time-sensitive helper spec | Rémy Coutable | 2017-03-17 | 1 | -6/+10 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Make the test less time sensitive by extending 0.2fix-make-time-test-more-reliable | Lin Jen-Shin | 2017-03-17 | 1 | -2/+2 |
| | | | | | | | days. This shall fix: https://gitlab.com/gitlab-org/gitlab-ce/builds/12411626 and other test failures for the same thing. | ||||
* | Merge branch '29534-todos-performance' into 'master' | Sean McGivern | 2017-03-16 | 1 | -0/+23 |
|\ | | | | | | | | | Improve TODOs performance See merge request !10004 | ||||
| * | Include routes when loading user projects | Jarka Kadlecova | 2017-03-16 | 1 | -0/+23 |
| | | |||||
* | | Merge branch '27376-cache-default-branch-pipeline-on-project' into 'master' | Yorick Peterse | 2017-03-16 | 2 | -0/+47 |
|\ \ | | | | | | | | | | | | | Speed up several project lists See merge request !9903 | ||||
| * | | Build project cache key in a helper27376-cache-default-branch-pipeline-on-project | Bob Van Landuyt | 2017-03-16 | 2 | -0/+47 |
| |/ | |||||
* | | Issue milestone remaining time tooltip | Michael | 2017-03-16 | 1 | -0/+50 |
|/ | |||||
* | Fix specs | Douwe Maan | 2017-03-14 | 2 | -12/+10 |
| | |||||
* | Fix first line markdown helper for user profile activity stream29425-fix-activity-stream-first-line-markdown | Eric Eastwood | 2017-03-14 | 1 | -2/+18 |
| | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29425 | ||||
* | Build link to discussions to resolve in a helper | Bob Van Landuyt | 2017-03-13 | 1 | -0/+32 |
| | |||||
* | Merge branch '26790-label-color-todos' into 'master' | Douwe Maan | 2017-03-07 | 1 | -0/+7 |
|\ | | | | | | | | | | | | | #26790 whitelist style attribute in event_note Closes #26790 See merge request !9155 | ||||
| * | whitelist style attribute in event_note | mhasbini | 2017-03-07 | 1 | -0/+7 |
| | | |||||
* | | Fix wrong image src with cached gl-emoji and relative root | Eric Eastwood | 2017-03-06 | 1 | -1/+1 |
| | | |||||
* | | Use native unicode emojis | Eric Eastwood | 2017-03-06 | 1 | -1/+1 |
|/ | | | | | | | | | | | | | | | | | | | | - gl_emoji for falling back to image/css-sprite when the browser doesn't support an emoji - Markdown rendering (Banzai filter) - Autocomplete - Award emoji menu - Perceived perf - Immediate response because we now build client-side - Update `digests.json` generation in gemojione rake task to be more useful and include `unicodeVersion` MR: !9437 See issues - #26371 - #27250 - #22474 | ||||
* | Merge branch 'format-timeago-date' into 'master' | Jacob Schatz | 2017-03-05 | 1 | -3/+3 |
|\ | | | | | | | | | | | | | Formats timeago dates to be more friendly Closes #27537 See merge request !9145 | ||||
| * | Fixed timeago specsformat-timeago-date | Phil Hughes | 2017-02-13 | 1 | -3/+3 |
| | | |||||
* | | Merge branch '2629-show-public-rss-feeds-to-anonymous-users' into 'master' | Douwe Maan | 2017-03-02 | 1 | -0/+20 |
|\ \ | | | | | | | | | | | | | | | | | | | Show public RSS feeds to anonymous users Closes #2629 See merge request !9596 | ||||
| * | | Show public RSS feeds to anonymous users | Michael Kozono | 2017-02-28 | 1 | -0/+20 |
| | | | |||||
* | | | Fix specs | Pedro Moreira da Silva | 2017-02-24 | 1 | -1/+1 |
|/ / | |||||
* | | Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-path | Douwe Maan | 2017-02-23 | 1 | -2/+2 |
| | | |||||
* | | Revert "Enable Style/DotPosition" | Douwe Maan | 2017-02-23 | 3 | -22/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9. # Conflicts: # .rubocop.yml # .rubocop_todo.yml # lib/gitlab/ci/config/entry/global.rb # lib/gitlab/ci/config/entry/jobs.rb # spec/lib/gitlab/ci/config/entry/factory_spec.rb # spec/lib/gitlab/ci/config/entry/global_spec.rb # spec/lib/gitlab/ci/config/entry/job_spec.rb # spec/lib/gitlab/ci/status/build/factory_spec.rb # spec/lib/gitlab/incoming_email_spec.rb | ||||
* | | Revert "Prefer leading style for Style/DotPosition" | Douwe Maan | 2017-02-23 | 14 | -106/+106 |
| | | | | | | | | This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b. | ||||
* | | Revert "Enable Style/BarePercentLiterals" | Douwe Maan | 2017-02-23 | 2 | -3/+3 |
| | | | | | | | | This reverts commit 96bef54154e669f9a3e92c3a4bc76c0be3a52e48. | ||||
* | | Enable Style/WordArray | Douwe Maan | 2017-02-23 | 3 | -3/+3 |
| | | |||||
* | | Prefer leading style for Style/DotPosition | Douwe Maan | 2017-02-23 | 14 | -106/+106 |
| | | |||||
* | | Fix code for cops | Douwe Maan | 2017-02-23 | 1 | -1/+1 |
| | | |||||
* | | Enable Style/BarePercentLiterals | Douwe Maan | 2017-02-23 | 2 | -3/+3 |
| | | |||||
* | | Enable Style/SpaceInsideBrackets | Douwe Maan | 2017-02-23 | 2 | -23/+23 |
| | | |||||
* | | Enable Style/DotPosition | Douwe Maan | 2017-02-23 | 3 | -22/+22 |
| | | |||||
* | | Merge branch ↵ | Clement Ho | 2017-02-22 | 1 | -0/+34 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | 'gamesover/gitlab-ce-broken_iamge_when_doing_offline_update_check(help_page)' into 'master' Gamesover/gitlab ce broken iamge when doing offline update check(help page) See merge request !8539 |